aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/open.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-20 12:39:15 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-03-20 12:45:40 +0100
commitb829595334e10454a6528bdac944d781f6102145 (patch)
tree718eee8f57d82633fc289ae16dfcfb5b8a77d375 /mediagoblin/db/open.py
parent39fd817ab8c4745187e5e1992d2f2866de38e2c2 (diff)
downloadmediagoblin-b829595334e10454a6528bdac944d781f6102145.tar.lz
mediagoblin-b829595334e10454a6528bdac944d781f6102145.tar.xz
mediagoblin-b829595334e10454a6528bdac944d781f6102145.zip
Create load_models().
So all models are ready when connecting to the db and so our "db" object has all models listed on it, create a function to load all models from the media_types, etc. Call it in setup_database() Problem: This gives celery warnings, because celery is imported before being setup properly. No idea how to fix this now. So media-type loading is excluded from load_models for now.
Diffstat (limited to 'mediagoblin/db/open.py')
-rw-r--r--mediagoblin/db/open.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 0163469f..f4c38511 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -21,7 +21,9 @@ except ImportError:
if use_sql:
from mediagoblin.db.sql.open import \
- setup_connection_and_db_from_config, check_db_migrations_current
+ setup_connection_and_db_from_config, check_db_migrations_current, \
+ load_models
else:
from mediagoblin.db.mongo.open import \
- setup_connection_and_db_from_config, check_db_migrations_current
+ setup_connection_and_db_from_config, check_db_migrations_current, \
+ load_models