Merging test migrations

etianen · Aug 31, 2020 · 1a01b9e · 1a01b9e
1 parent 22c53e9
commit 1a01b9e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 72 deletions.
diff --git a/tests/test_app/migrations/0001_initial.py b/tests/test_app/migrations/0001_initial.py
@@ -1,4 +1,5 @@
-# Generated by Django 1.9.7 on 2016-06-14 10:27
+# Generated by Django 3.1 on 2020-08-31 10:05
+
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -8,19 +9,11 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
         ('reversion', '0001_squashed_0004_auto_20160611_1202'),
+        ('contenttypes', '0002_remove_content_type_name'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='TestMeta',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=191)),
-                ('revision', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reversion.Revision')),
-            ],
-        ),
         migrations.CreateModel(
             name='TestModel',
             fields=[
@@ -29,27 +22,17 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='TestModelGenericInline',
+            name='TestModelEscapePK',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('object_id', models.IntegerField()),
-                ('inline_name', models.CharField(default='v1', max_length=191)),
-                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                ('name', models.CharField(max_length=191, primary_key=True, serialize=False)),
             ],
         ),
         migrations.CreateModel(
             name='TestModelInline',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('inline_name', models.CharField(default='v1', max_length=191)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='TestModelNestedInline',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('nested_inline_name', models.CharField(default=b'v1', max_length=191)),
-                ('test_model_inline', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='test_app.TestModelInline')),
+                ('test_model', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='test_app.testmodel')),
             ],
         ),
         migrations.CreateModel(
@@ -60,7 +43,7 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='TestModelThrough',
+            name='TestModelWithNaturalKey',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(default='v1', max_length=191)),
@@ -69,31 +52,43 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='TestModelParent',
             fields=[
-                ('testmodel_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='test_app.TestModel')),
+                ('testmodel_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='test_app.testmodel')),
                 ('parent_name', models.CharField(default='parent v1', max_length=191)),
             ],
             bases=('test_app.testmodel',),
         ),
         migrations.CreateModel(
-            name='TestModelEscapePK',
+            name='TestModelThrough',
             fields=[
-                ('name', models.CharField(max_length=191, primary_key=True, serialize=False)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(default='v1', max_length=191)),
+                ('test_model', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='test_app.testmodel')),
+                ('test_model_related', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='test_app.testmodelrelated')),
             ],
         ),
-        migrations.AddField(
-            model_name='testmodelthrough',
-            name='test_model',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='test_app.TestModel'),
+        migrations.CreateModel(
+            name='TestModelNestedInline',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('nested_inline_name', models.CharField(default='v1', max_length=191)),
+                ('test_model_inline', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='test_app.testmodelinline')),
+            ],
         ),
-        migrations.AddField(
-            model_name='testmodelthrough',
-            name='test_model_related',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='test_app.TestModelRelated'),
+        migrations.CreateModel(
+            name='TestModelInlineByNaturalKey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('test_model', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='test_app.testmodelwithnaturalkey')),
+            ],
         ),
-        migrations.AddField(
-            model_name='testmodelinline',
-            name='test_model',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='test_app.TestModel'),
+        migrations.CreateModel(
+            name='TestModelGenericInline',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('object_id', models.IntegerField()),
+                ('inline_name', models.CharField(default='v1', max_length=191)),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+            ],
         ),
         migrations.AddField(
             model_name='testmodel',
@@ -105,4 +100,12 @@ class Migration(migrations.Migration):
             name='related_through',
             field=models.ManyToManyField(blank=True, related_name='_testmodel_related_through_+', through='test_app.TestModelThrough', to='test_app.TestModelRelated'),
         ),
+        migrations.CreateModel(
+            name='TestMeta',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=191)),
+                ('revision', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='reversion.revision')),
+            ],
+        ),
     ]
diff --git a/tests/test_app/migrations/0002_naturalkey.py b/tests/test_app/migrations/0002_naturalkey.py