diff options
Diffstat (limited to 'mediagoblin/db/open.py')
| -rw-r--r-- | mediagoblin/db/open.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py index 4b4dfa12..9922cc10 100644 --- 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): |