diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-04 10:54:44 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-04 10:54:44 -0400 |
| commit | a00ac32045a7a03d91e0e64ee8470f0bd6f383d8 (patch) | |
| tree | 8e0033d6439617bfb942139eec80211a14b8a3fc | |
| parent | f2e3a6a01c2a8c63064152fd92d58b4903222d18 (diff) | |
| download | mediagoblin-a00ac32045a7a03d91e0e64ee8470f0bd6f383d8.tar.lz mediagoblin-a00ac32045a7a03d91e0e64ee8470f0bd6f383d8.tar.xz mediagoblin-a00ac32045a7a03d91e0e64ee8470f0bd6f383d8.zip | |
Make sure MigrationManagers always get Unicode names.
If we fail to do this, SQLAlchemy complains that we're binding a
non-Unicode value to a Unicode column.
| -rw-r--r-- | mediagoblin/gmg_commands/dbupdate.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/test_sql_migrations.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index dc36be82..1c48ff57 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -52,7 +52,7 @@ def gather_database_data(media_types): managed_dbdata.append( DatabaseData( - '__main__', MAIN_MODELS, MAIN_MIGRATIONS)) + u'__main__', MAIN_MODELS, MAIN_MIGRATIONS)) # Then get all registered media managers (eventually, plugins) for media_type in media_types: diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index 507a7725..7fea101c 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -561,7 +561,7 @@ def test_set1_to_set3(): printer = CollectingPrinter() migration_manager = MigrationManager( - '__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), + u'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), printer) # 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 migration_manager = MigrationManager( - '__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), + u'__main__', SET1_MODELS, SET1_MIGRATIONS, Session(), printer) assert migration_manager.init_or_migrate() == None @@ -668,7 +668,7 @@ def test_set1_to_set3(): # isn't said to be updated yet printer = CollectingPrinter() migration_manager = MigrationManager( - '__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), + u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), printer) assert migration_manager.latest_migration == 7 @@ -694,7 +694,7 @@ def test_set1_to_set3(): # Make sure version matches expected migration_manager = MigrationManager( - '__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), + u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), printer) assert migration_manager.latest_migration == 7 assert migration_manager.database_current_migration == 7 |