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

Make sure MigrationManagers always get Unicode names.

Browse Source 
If we fail to do this, SQLAlchemy complains that we're binding a
non-Unicode value to a Unicode column.
This commit is contained in:
Brett Smith 2012-07-04 10:54:44 -04:00
parent f2e3a6a01c
commit a00ac32045
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/gmg_commands/dbupdate.py
View File

@ -52,7 +52,7 @@ def gather_database_data(media_types):
managed_dbdata.append( managed_dbdata.append(
DatabaseData( DatabaseData(
'__main__', MAIN_MODELS, MAIN_MIGRATIONS)) u'__main__', MAIN_MODELS, MAIN_MIGRATIONS))
# Then get all registered media managers (eventually, plugins) # Then get all registered media managers (eventually, plugins)
for media_type in media_types: for media_type in media_types:

8
mediagoblin/tests/test_sql_migrations.py
View File

@ -561,7 +561,7 @@ def test_set1_to_set3():
printer = CollectingPrinter() printer = CollectingPrinter()
migration_manager = MigrationManager( migration_manager = MigrationManager(
'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), u'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(),
printer) printer)
# Check latest migration and database current migration # Check latest migration and database current migration
@ -586,7 +586,7 @@ def test_set1_to_set3():
# Try to "re-migrate" with same manager settings... nothing should happen # Try to "re-migrate" with same manager settings... nothing should happen
migration_manager = MigrationManager( migration_manager = MigrationManager(
'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), u'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(),
printer) printer)
assert migration_manager.init_or_migrate() == None assert migration_manager.init_or_migrate() == None
@ -668,7 +668,7 @@ def test_set1_to_set3():
# isn't said to be updated yet # isn't said to be updated yet
printer = CollectingPrinter() printer = CollectingPrinter()
migration_manager = MigrationManager( migration_manager = MigrationManager(
'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(),
printer) printer)
assert migration_manager.latest_migration == 7 assert migration_manager.latest_migration == 7
@ -694,7 +694,7 @@ def test_set1_to_set3():
# Make sure version matches expected # Make sure version matches expected
migration_manager = MigrationManager( migration_manager = MigrationManager(
'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(),
printer) printer)
assert migration_manager.latest_migration == 7 assert migration_manager.latest_migration == 7
assert migration_manager.database_current_migration == 7 assert migration_manager.database_current_migration == 7