From a605bf451f76d4ff2bb471b066c3245d4ffc6f7b Mon Sep 17 00:00:00 2001
From: Doug Blank <dblank@cs.brynmawr.edu>
Date: Sat, 16 Apr 2016 23:47:29 -0400
Subject: [PATCH] Replace dictionarydb with inmemorydb, a sqlite :memory: db

---
 .travis.yml                                   | 2 +-
 gramps/gen/db/__init__.py                     | 7 +++++++
 gramps/gen/lib/test/field_test.py             | 4 ++--
 gramps/gen/merge/diff.py                      | 8 ++++----
 gramps/gui/editors/test/test_editreference.py | 1 -
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31ba7c95b..76ad4e334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ before_script:
 script:
  # --exclude=TestUser because of older version of mock
  #                    without configure_mock
- - nosetests3 --nologcapture --with-coverage --cover-package=gramps --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  --exclude=user_test gramps
+ - GRAMPS_RESOURCES=. nosetests3 --nologcapture --with-coverage --cover-package=gramps --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  --exclude=user_test gramps
 
 after_success:
  - codecov
diff --git a/gramps/gen/db/__init__.py b/gramps/gen/db/__init__.py
index 7806c7926..f0197e798 100644
--- a/gramps/gen/db/__init__.py
+++ b/gramps/gen/db/__init__.py
@@ -117,3 +117,10 @@ def open_database(database, force_unlock=False):
     """
     from ..dbstate import DbState
     return DbState().open_database(database, force_unlock)
+
+def make_database(dbid):
+    """
+    Shortcut for external uses of databases.
+    """
+    from ..dbstate import DbState
+    return DbState().make_database(dbid)
diff --git a/gramps/gen/lib/test/field_test.py b/gramps/gen/lib/test/field_test.py
index 8fb4b275f..8f9e638cf 100644
--- a/gramps/gen/lib/test/field_test.py
+++ b/gramps/gen/lib/test/field_test.py
@@ -22,7 +22,7 @@
 
 import unittest
 
-from gramps.plugins.database.dictionarydb import DictionaryDb
+from gramps.gen.db import make_database
 
 from  ..import (Person, Surname, Name, NameType, Family, FamilyRelType,
                 Event, EventType, Source, Place, PlaceName, Citation, Date,
@@ -36,7 +36,7 @@ from  ..import (Person, Surname, Name, NameType, Family, FamilyRelType,
 class FieldBaseTest(unittest.TestCase):
 
     def setUp(self):
-        db = DictionaryDb()
+        db = make_database("inmemorydb")
         db.load(None)
         with db.get_transaction_class()("Test", db) as trans:
             # Add some people:
diff --git a/gramps/gen/merge/diff.py b/gramps/gen/merge/diff.py
index a53f72c27..a9bf0a29b 100644
--- a/gramps/gen/merge/diff.py
+++ b/gramps/gen/merge/diff.py
@@ -28,7 +28,7 @@ from gramps.cli.user import User
 from ..dbstate import DbState
 from gramps.cli.grampscli import CLIManager
 from ..plug import BasePluginManager
-from gramps.plugins.database.dictionarydb import DictionaryDb
+from gramps.gen.db import make_database
 from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
 
@@ -84,11 +84,11 @@ def parse(string):
 
 def import_as_dict(filename, user=None):
     """
-    Import the filename into a DictionaryDb and return it.
+    Import the filename into a InMemoryDB and return it.
     """
     if user is None:
         user = User()
-    db = DictionaryDb()
+    db = make_database("inmemorydb")
     db.load(None)
     db.set_feature("skip-import-additions", True)
     dbstate = DbState()
@@ -225,7 +225,7 @@ def diff_dbs(db1, db2, user=None):
 def diff_db_to_file(old_db, filename, user=None):
     if user is None:
         user = User()
-    # First, get data as a DictionaryDb
+    # First, get data as a InMemoryDB
     new_db = import_as_dict(filename, user, user)
     if new_db is not None:
         # Next get differences:
diff --git a/gramps/gui/editors/test/test_editreference.py b/gramps/gui/editors/test/test_editreference.py
index 5815b0a2e..393f3feac 100644
--- a/gramps/gui/editors/test/test_editreference.py
+++ b/gramps/gui/editors/test/test_editreference.py
@@ -33,7 +33,6 @@ except:
 
 from  gramps.gen.lib import (Person, Family, Event, Source, Place, Citation,
                              Repository, Media, Note, Tag)
-from gramps.gen.merge.diff import DictionaryDb
 from gramps.cli.user import User
 from gramps.gen.dbstate import DbState
 from gramps.gen.merge.diff import *