use SingletonThreadPool when running tests, NullPool when running for…

… real
Bauble · Dec 24, 2015 · 483d2e6 · 483d2e6 · mfrasca · Dec 24, 2015
1 parent 79c7cdb
commit 483d2e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bauble/db.py b/bauble/db.py
@@ -254,10 +254,12 @@ def open(uri, verify=True, show_error_dialogs=False):
     global engine
     new_engine = None
 
-    import sqlalchemy.pool as pool
+    from sqlalchemy.pool import NullPool, SingletonThreadPool
+    from bauble import gui
+    poolclass = gui and NullPool or SingletonThreadPool
     new_engine = sa.create_engine(uri, echo=SQLALCHEMY_DEBUG,
                                   implicit_returning=False,
-                                  poolclass=pool.NullPool)
+                                  poolclass=poolclass)
     # TODO: there is a problem here: the code may cause an exception, but we
     # immediately loose the 'new_engine', which should know about the
     # encoding used in the exception string.