Fixing migrations so they work with merge

UCL · Jun 17, 2024 · c0696b3 · c0696b3
1 parent 509f6ab
commit c0696b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/rard/research/migrations/0071_add_duplicates_field.py b/src/rard/research/migrations/0071_add_duplicates_field.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2 on 2024-05-07 12:52
+# Generated by Django 3.2 on 2024-03-07 12:18
 
 from django.db import migrations, models
 
@@ -28,6 +28,16 @@ class Migration(migrations.Migration):
                 to="research.Fragment",
             ),
         ),
+        # Currently this isn't utilised but as HistoricalBase is abstract it's part of the migration
+        migrations.AddField(
+            model_name="testimonium",
+            name="duplicate_frags",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="testimonium_duplicate_fragments",
+                to="research.Fragment",
+            ),
+        ),
         migrations.AddField(
             model_name="anonymousfragment",
             name="duplicate_afs",
@@ -46,4 +56,14 @@ class Migration(migrations.Migration):
                 to="research.AnonymousFragment",
             ),
         ),
+        # Currently this isn't utilised but as HistoricalBase is abstract it's part of the migration
+        migrations.AddField(
+            model_name="testimonium",
+            name="duplicate_afs",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="testimonium_duplicate_anonfragments",
+                to="research.AnonymousFragment",
+            ),
+        ),
     ]
diff --git a/src/rard/research/migrations/0072_adding_testimonia_duplicates.py b/src/rard/research/migrations/0072_adding_testimonia_duplicates.py
@@ -9,24 +9,6 @@ class Migration(migrations.Migration):
 
 
 operations = [
-    migrations.AddField(
-        model_name="testimonium",
-        name="duplicate_frags",
-        field=models.ManyToManyField(
-            blank=True,
-            related_name="testimonium_duplicate_fragments",
-            to="research.Fragment",
-        ),
-    ),
-    migrations.AddField(
-        model_name="testimonium",
-        name="duplicate_afs",
-        field=models.ManyToManyField(
-            blank=True,
-            related_name="testimonium_duplicate_anonfragments",
-            to="research.AnonymousFragment",
-        ),
-    ),
     migrations.AddField(
         model_name="anonymousfragment",
         name="duplicate_ts",