Fix ContentType related migrations

This should fix the issues reported in FS#23228 for the most part.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 20 insertions, 1 deletions

diff --git a/mirrors/migrations/0002_rename_model_tables.py b/mirrors/migrations/0002_rename_model_tables.py
index d510bad..087edd6 100644
--- a/mirrors/migrations/0002_rename_model_tables.py
+++ b/mirrors/migrations/0002_rename_model_tables.py
@@ -7,21 +7,33 @@ from django.db import models
 class Migration(SchemaMigration):
 
     depends_on = (
-        ('main', '0014_mirror_notes_rsync_optional'),
+        ('main', '0030_move_mirror_models'),
     )
 
+    mirror_apps = [ 'mirror', 'mirrorprotocol', 'mirrorurl', 'mirrorrsync' ]
+
     def forwards(self, orm):
         db.rename_table('main_mirror', 'mirrors_mirror')
         db.rename_table('main_mirrorurl', 'mirrors_mirrorurl')
         db.rename_table('main_mirrorrsync', 'mirrors_mirrorrsync')
         db.rename_table('main_mirrorprotocol', 'mirrors_mirrorprotocol')
 
+        if not db.dry_run:
+            ct = orm['contenttypes.ContentType'].objects
+            ct.filter(app_label='main', model__in=self.mirror_apps).update(
+                    app_label='mirrors')
+
     def backwards(self, orm):
         db.rename_table('mirrors_mirror', 'main_mirror')
         db.rename_table('mirrors_mirrorurl', 'main_mirrorurl')
         db.rename_table('mirrors_mirrorrsync', 'main_mirrorrsync')
         db.rename_table('mirrors_mirrorprotocol', 'main_mirrorprotocol')
 
+        if not db.dry_run:
+            ct = orm['contenttypes.ContentType'].objects
+            ct.filter(app_label='mirrors', model__in=self.mirror_apps).update(
+                    app_label='main')
+
     models = {
         'mirrors.mirror': {
             'Meta': {'ordering': "('country', 'name')", 'object_name': 'Mirror'},
@@ -55,6 +67,13 @@ class Migration(SchemaMigration):
             'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.Mirror']"}),
             'protocol': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.MirrorProtocol']"}),
             'url': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         }
     }