From 7c563e91bf66b0c01dfceb65c614b0da84ed91c3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 3 Dec 2014 13:13:58 -0600 Subject: Attach the MediaGoblinApp to the engine, and provide a way for models to access This allows SQLAlchemy models to gain access to app-level configuration without the need for global variables. This commit sponsored by Peter Hogg. Thank you, Peter! --- mediagoblin/init/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mediagoblin/init') diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index b6421e06..38ec1260 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -60,14 +60,16 @@ def setup_global_and_app_config(config_path): return global_config, app_config -def setup_database(run_migrations=False): - app_config = mg_globals.app_config - global_config = mg_globals.global_config +def setup_database(app): + app_config = app.app_config + global_config = app.global_config + run_migrations = app_config['run_migrations'] # Load all models for media types (plugins, ...) load_models(app_config) # Set up the database - db = setup_connection_and_db_from_config(app_config, run_migrations) + db = setup_connection_and_db_from_config( + app_config, run_migrations, app=app) if run_migrations: #Run the migrations to initialize/update the database. from mediagoblin.gmg_commands.dbupdate import run_all_migrations -- cgit v1.2.3