Return DatabaseManager or DatabaseMaster depending on DISABLE_GLOBALS

They're both similar!  One sets up sessions, one grabs sessions from a global object.

diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 4b4dfa12089c20422c79d79e9c9b3d73a6e46fa0..9922cc1053aaaa46f2d906fe53ee53c015cb2f89 100644 (file)
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -142,9 +142,13 @@ def setup_connection_and_db_from_config(app_config, migrations=False):
 
     # logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
 
-    Session.configure(bind=engine)
+    if DISABLE_GLOBALS:
+        return DatabaseManager(engine)
 
-    return DatabaseMaster(engine)
+    else:
+        Session.configure(bind=engine)
+
+        return DatabaseMaster(engine)
 
 
 def check_db_migrations_current(db):