Utils for migrations

misago/conf/migrationutils.py

@@ -3,7 +3,7 @@ from misago.conf.dbsettings import CACHE_KEY
 from misago.core.cache import cache as default_cache
 
 
-def migration_models(migration, this_migration=None):
+def with_conf_models(migration, this_migration=None):
     module_name = 'misago.conf.migrations.%s' % migration
     migration_module = import_module(module_name)
     conf_models = migration_module.Migration.models

misago/core/migrations/0002_db_settings.py

@@ -3,7 +3,7 @@ from south.utils import datetime_utils as datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from misago.conf.migrationutils import migration_models, migrate_settings_group
+from misago.conf.migrationutils import with_conf_models, migrate_settings_group
 from misago.core.migrationutils import ugettext_lazy as _
 
 
@@ -54,11 +54,11 @@ class Migration(DataMigration):
     def backwards(self, orm):
         "Write your backwards methods here."
 
-    models = migration_models('0001_initial')
+    models = with_conf_models('0001_initial')
 
     complete_apps = ['core']
     symmetrical = True
 
     depends_on = (
-        ("misago.conf", "0001_initial"),
+        ("conf", "0001_initial"),
     )

misago/core/migrationutils.py

@@ -1,3 +1,4 @@
+from importlib import import_module
 from django.utils import translation
 from misago.core.cache import cache as default_cache
 from misago.core.cachebuster import CACHE_KEY
@@ -14,6 +15,16 @@ def ugettext_lazy(string):
     return t
 
 
+def with_core_models(migration, this_migration=None):
+    module_name = 'misago.core.migrations.%s' % migration
+    migration_module = import_module(module_name)
+    core_models = migration_module.Migration.models
+
+    if this_migration:
+        core_models.update(this_migration)
+    return core_models
+
+
 def cachebuster_register_cache(orm, cache):
     orm.CacheVersion.objects.create(cache=cache)