heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mongo->sql conversion script now runs mongo migrations first, just in case

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-03-17 17:08:46 -05:00
parent 4a250dbdde
commit 9e55431143
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/gmg_commands/migrate.py
View File

@ -17,7 +17,7 @@
import sys import sys
from mediagoblin.db.mongo import util as db_util from mediagoblin.db.mongo import util as db_util
from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.db.mongo.open import setup_connection_and_db_from_config
from mediagoblin.init import setup_global_and_app_config from mediagoblin.init import setup_global_and_app_config
# This MUST be imported so as to set up the appropriate migrations! # This MUST be imported so as to set up the appropriate migrations!
@ -41,7 +41,12 @@ def _print_finished_migration(migration_number, migration_func):
def migrate(args): def migrate(args):
global_config, app_config = setup_global_and_app_config(args.conf_file) run_migrate(args.conf_file)
def run_migrate(conf_file):
global_config, app_config = setup_global_and_app_config(conf_file)
connection, db = setup_connection_and_db_from_config( connection, db = setup_connection_and_db_from_config(
app_config, use_pymongo=True) app_config, use_pymongo=True)
migration_manager = db_util.MigrationManager(db) migration_manager = db_util.MigrationManager(db)

4
mediagoblin/gmg_commands/mongosql.py
View File

@ -20,5 +20,9 @@ def mongosql_parser_setup(subparser):
def mongosql(args): def mongosql(args):
# First, make sure our mongo migrations are up to date...
from mediagoblin.gmg_commands.migrate import run_migrate
run_migrate(args.conf_file)
from mediagoblin.db.sql.convert import run_conversion from mediagoblin.db.sql.convert import run_conversion
run_conversion(args.conf_file) run_conversion(args.conf_file)