Fix db migrations

4 files changed, 5 insertions, 167 deletions

diff --git a/archaeological_warehouse/migrations/0102_auto_20200324_1142.py b/archaeological_warehouse/migrations/0102_auto_20200324_1142.py
deleted file mode 100644
index 4006a9701..000000000
--- a/archaeological_warehouse/migrations/0102_auto_20200324_1142.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-03-24 11:42
-from __future__ import unicode_literals
-
-from django.conf import settings
-import django.contrib.gis.db.models.fields
-import django.contrib.postgres.fields.jsonb
-import django.contrib.postgres.search
-from django.db import migrations, models
-import django.db.models.deletion
-import simple_history.models
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('ishtar_common', '0202_auto_20200129_1941'),
-        ('archaeological_warehouse', '0101_squashed'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='HistoricalWarehouse',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={})),
-                ('search_vector', django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector')),
-                ('qrcode', models.TextField(blank=True, max_length=255, null=True)),
-                ('x', models.FloatField(blank=True, null=True, verbose_name='X')),
-                ('y', models.FloatField(blank=True, null=True, verbose_name='Y')),
-                ('z', models.FloatField(blank=True, null=True, verbose_name='Z')),
-                ('estimated_error_x', models.FloatField(blank=True, null=True, verbose_name='Estimated error for X')),
-                ('estimated_error_y', models.FloatField(blank=True, null=True, verbose_name='Estimated error for Y')),
-                ('estimated_error_z', models.FloatField(blank=True, null=True, verbose_name='Estimated error for Z')),
-                ('point', django.contrib.gis.db.models.fields.PointField(blank=True, dim=3, null=True, srid=4326, verbose_name='Point')),
-                ('point_2d', django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=4326, verbose_name='Point (2D)')),
-                ('point_source', models.CharField(blank=True, choices=[('T', 'Town'), ('P', 'Precise'), ('M', 'Polygon')], max_length=1, null=True, verbose_name='Point source')),
-                ('point_source_item', models.CharField(blank=True, max_length=100, null=True, verbose_name='Point source item')),
-                ('multi_polygon', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326, verbose_name='Multi polygon')),
-                ('multi_polygon_source', models.CharField(blank=True, choices=[('T', 'Town'), ('P', 'Precise'), ('M', 'Polygon')], max_length=1, null=True, verbose_name='Multi-polygon source')),
-                ('multi_polygon_source_item', models.CharField(blank=True, max_length=100, null=True, verbose_name='Multi polygon source item')),
-                ('last_modified', models.DateTimeField(blank=True, editable=False)),
-                ('history_m2m', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={})),
-                ('need_update', models.BooleanField(default=False, verbose_name='Need update')),
-                ('locked', models.BooleanField(default=False, verbose_name='Item locked for edition')),
-                ('address', models.TextField(blank=True, null=True, verbose_name='Address')),
-                ('address_complement', models.TextField(blank=True, null=True, verbose_name='Address complement')),
-                ('postal_code', models.CharField(blank=True, max_length=10, null=True, verbose_name='Postal code')),
-                ('town', models.CharField(blank=True, max_length=150, null=True, verbose_name='Town (freeform)')),
-                ('country', models.CharField(blank=True, max_length=30, null=True, verbose_name='Country')),
-                ('alt_address', models.TextField(blank=True, null=True, verbose_name='Other address: address')),
-                ('alt_address_complement', models.TextField(blank=True, null=True, verbose_name='Other address: address complement')),
-                ('alt_postal_code', models.CharField(blank=True, max_length=10, null=True, verbose_name='Other address: postal code')),
-                ('alt_town', models.CharField(blank=True, max_length=70, null=True, verbose_name='Other address: town')),
-                ('alt_country', models.CharField(blank=True, max_length=30, null=True, verbose_name='Other address: country')),
-                ('phone', models.CharField(blank=True, max_length=18, null=True, verbose_name='Phone')),
-                ('phone_desc', models.CharField(blank=True, max_length=300, null=True, verbose_name='Phone description')),
-                ('phone2', models.CharField(blank=True, max_length=18, null=True, verbose_name='Phone description 2')),
-                ('phone_desc2', models.CharField(blank=True, max_length=300, null=True, verbose_name='Phone description 2')),
-                ('phone3', models.CharField(blank=True, max_length=18, null=True, verbose_name='Phone 3')),
-                ('phone_desc3', models.CharField(blank=True, max_length=300, null=True, verbose_name='Phone description 3')),
-                ('raw_phone', models.TextField(blank=True, null=True, verbose_name='Raw phone')),
-                ('mobile_phone', models.CharField(blank=True, max_length=18, null=True, verbose_name='Mobile phone')),
-                ('email', models.EmailField(blank=True, max_length=300, null=True, verbose_name='Email')),
-                ('alt_address_is_prefered', models.BooleanField(default=False, verbose_name='Alternative address is prefered')),
-                ('uuid', models.UUIDField(default=uuid.uuid4)),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('comment', models.TextField(blank=True, null=True, verbose_name='Comment')),
-                ('external_id', models.TextField(blank=True, null=True, verbose_name='External ID')),
-                ('auto_external_id', models.BooleanField(default=False, verbose_name='External ID is set automatically')),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_change_reason', models.CharField(max_length=100, null=True)),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_creator', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Creator')),
-                ('history_modifier', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Last editor')),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('lock_user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Locked by')),
-                ('main_image', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Document', verbose_name='Main image')),
-                ('organization', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Organization', verbose_name='Organization')),
-                ('person_in_charge', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Person in charge')),
-                ('precise_town', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Town', verbose_name='Town (precise)')),
-                ('spatial_reference_system', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.SpatialReferenceSystem', verbose_name='Spatial Reference System')),
-                ('warehouse_type', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_warehouse.WarehouseType', verbose_name='Warehouse type')),
-            ],
-            options={
-                'verbose_name': 'historical Warehouse',
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-            },
-            bases=(simple_history.models.HistoricalChanges, models.Model),
-        ),
-        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'),
-        ),
-    ]
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/0104_auto_container_views.py
deleted file mode 100644
index 4f707c8d7..000000000
--- a/archaeological_warehouse/migrations/0104_auto_container_views.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-04-03 16:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-import archaeological_warehouse.models
-import archaeological_finds.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0103_auto_20200403_1638'),
-    ]
-
-    operations = [
-        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/debian/changelog b/debian/changelog
index 8bcf7244b..f593833b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+python-django-ishtar (3.1.0beta-6) UNRELEASED; urgency=low
+
+  * Fix db migrations
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 15 Dec 2020 19:48:00 +0200
 python-django-ishtar (3.1.0beta-5) UNRELEASED; urgency=low
 
   * New version