Squash migrations

6 files changed, 74 insertions, 141 deletions

diff --git a/archaeological_warehouse/migrations/0102_auto_20200324_1142.py b/archaeological_warehouse/migrations/0102_auto_20200408_1823.py
index 4006a9701..6bc7f8f88 100644
--- a/archaeological_warehouse/migrations/0102_auto_20200324_1142.py
+++ b/archaeological_warehouse/migrations/0102_auto_20200408_1823.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-03-24 11:42
+# Generated by Django 1.11.27 on 2020-04-08 18:23
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -15,8 +15,8 @@ import uuid
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('ishtar_common', '0203_auto_20200407_1142'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('ishtar_common', '0202_auto_20200129_1941'),
         ('archaeological_warehouse', '0101_squashed'),
     ]
 
@@ -92,9 +92,76 @@ class Migration(migrations.Migration):
             },
             bases=(simple_history.models.HistoricalChanges, models.Model),
         ),
+        migrations.RemoveField(
+            model_name='collection',
+            name='history_creator',
+        ),
+        migrations.RemoveField(
+            model_name='collection',
+            name='history_modifier',
+        ),
+        migrations.RemoveField(
+            model_name='collection',
+            name='imports',
+        ),
+        migrations.RemoveField(
+            model_name='collection',
+            name='lock_user',
+        ),
+        migrations.RemoveField(
+            model_name='collection',
+            name='warehouse',
+        ),
+        migrations.AddField(
+            model_name='container',
+            name='archived',
+            field=models.NullBooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='container',
+            name='merge_candidate',
+            field=models.ManyToManyField(blank=True, related_name='_container_merge_candidate_+', to='archaeological_warehouse.Container'),
+        ),
+        migrations.AddField(
+            model_name='container',
+            name='merge_exclusion',
+            field=models.ManyToManyField(blank=True, related_name='_container_merge_exclusion_+', to='archaeological_warehouse.Container'),
+        ),
+        migrations.AddField(
+            model_name='container',
+            name='merge_key',
+            field=models.TextField(blank=True, null=True, verbose_name='Merge key'),
+        ),
         migrations.AddField(
             model_name='container',
             name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_warehouse.Container', verbose_name='Parent container'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='archaeological_warehouse.Container', verbose_name='Parent container'),
+        ),
+        migrations.AddField(
+            model_name='containertype',
+            name='stationary',
+            field=models.BooleanField(default=False, help_text='Container that usually will not be moved. Ex: building, room.', verbose_name='Stationary'),
+        ),
+        migrations.AddField(
+            model_name='warehousedivisionlink',
+            name='container_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.ContainerType'),
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='responsible',
+            field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owned_containers', to='archaeological_warehouse.Warehouse', verbose_name='Responsible warehouse'),
+        ),
+        migrations.AlterField(
+            model_name='warehousedivisionlink',
+            name='division',
+            field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.WarehouseDivision'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='container',
+            unique_together=set([('location', 'container_type', 'parent', 'reference'), ('index', 'responsible')]),
+        ),
+        migrations.DeleteModel(
+            name='Collection',
         ),
     ]
diff --git a/archaeological_warehouse/migrations/0103_auto_20200403_1638.py b/archaeological_warehouse/migrations/0103_auto_20200403_1638.py
deleted file mode 100644
index d7bd5320b..000000000
--- a/archaeological_warehouse/migrations/0103_auto_20200403_1638.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-03 16:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0102_auto_20200324_1142'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='containertype',
-            name='stationary',
-            field=models.BooleanField(default=False, help_text='Container that usually will not be moved. Ex: building, room.', verbose_name='Stationary'),
-        ),
-        migrations.AddField(
-            model_name='warehousedivisionlink',
-            name='container_type',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.ContainerType'),
-        ),
-        migrations.AlterField(
-            model_name='container',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='archaeological_warehouse.Container', verbose_name='Parent container'),
-        ),
-        migrations.AlterField(
-            model_name='container',
-            name='responsible',
-            field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owned_containers', to='archaeological_warehouse.Warehouse', verbose_name='Responsible warehouse'),
-        ),
-        migrations.AlterField(
-            model_name='warehousedivisionlink',
-            name='division',
-            field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.WarehouseDivision'),
-        ),
-    ]
diff --git a/archaeological_warehouse/migrations/0104_auto_container_views.py b/archaeological_warehouse/migrations/0103_auto_container_views.py
index 4f707c8d7..0a5bacc81 100644
--- a/archaeological_warehouse/migrations/0104_auto_container_views.py
+++ b/archaeological_warehouse/migrations/0103_auto_container_views.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-03 16:47
+# Generated by Django 1.11.27 on 2020-04-08 18:23
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -11,16 +11,16 @@ import archaeological_finds.models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_warehouse', '0103_auto_20200403_1638'),
+        ('archaeological_warehouse', '0102_auto_20200408_1823'),
     ]
 
     operations = [
         migrations.RunSQL(
+            archaeological_finds.models.FindInsideContainer.DELETE_SQL),
+        migrations.RunSQL(
             archaeological_warehouse.models.ContainerTree.DELETE_SQL),
         migrations.RunSQL(
             archaeological_warehouse.models.ContainerTree.CREATE_SQL),
         migrations.RunSQL(
-            archaeological_finds.models.FindInsideContainer.DELETE_SQL),
-        migrations.RunSQL(
             archaeological_finds.models.FindInsideContainer.CREATE_SQL),
     ]
diff --git a/archaeological_warehouse/migrations/0105_auto_20200407_1021.py b/archaeological_warehouse/migrations/0105_auto_20200407_1021.py
deleted file mode 100644
index 7465afd08..000000000
--- a/archaeological_warehouse/migrations/0105_auto_20200407_1021.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-07 10:21
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0104_auto_container_views'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='container',
-            unique_together=set([('index', 'responsible'),
-                                 ('location', 'container_type', 'parent', 'reference')]),
-        ),
-    ]
diff --git a/archaeological_warehouse/migrations/0106_auto_20200407_1414.py b/archaeological_warehouse/migrations/0106_auto_20200407_1414.py
deleted file mode 100644
index 9ec357d8a..000000000
--- a/archaeological_warehouse/migrations/0106_auto_20200407_1414.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-07 14:14
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0105_auto_20200407_1021'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='collection',
-            name='history_creator',
-        ),
-        migrations.RemoveField(
-            model_name='collection',
-            name='history_modifier',
-        ),
-        migrations.RemoveField(
-            model_name='collection',
-            name='imports',
-        ),
-        migrations.RemoveField(
-            model_name='collection',
-            name='lock_user',
-        ),
-        migrations.RemoveField(
-            model_name='collection',
-            name='warehouse',
-        ),
-        migrations.DeleteModel(
-            name='Collection',
-        ),
-    ]
diff --git a/archaeological_warehouse/migrations/0107_auto_20200407_1553.py b/archaeological_warehouse/migrations/0107_auto_20200407_1553.py
deleted file mode 100644
index 56aeddd47..000000000
--- a/archaeological_warehouse/migrations/0107_auto_20200407_1553.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-07 15:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0106_auto_20200407_1414'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='container',
-            name='archived',
-            field=models.NullBooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='container',
-            name='merge_candidate',
-            field=models.ManyToManyField(blank=True, related_name='_container_merge_candidate_+', to='archaeological_warehouse.Container'),
-        ),
-        migrations.AddField(
-            model_name='container',
-            name='merge_exclusion',
-            field=models.ManyToManyField(blank=True, related_name='_container_merge_exclusion_+', to='archaeological_warehouse.Container'),
-        ),
-        migrations.AddField(
-            model_name='container',
-            name='merge_key',
-            field=models.TextField(blank=True, null=True, verbose_name='Merge key'),
-        ),
-    ]