diff options
8 files changed, 52 insertions, 40 deletions
diff --git a/archaeological_context_records/migrations/0050_dating_uuid.py b/archaeological_context_records/migrations/0050_dating_uuid.py index c2413bd2d..093571015 100644 --- a/archaeological_context_records/migrations/0050_dating_uuid.py +++ b/archaeological_context_records/migrations/0050_dating_uuid.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -20,8 +18,12 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('archaeological_context_records', - 'Dating')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + update archaeological_context_records_dating set uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='dating', name='uuid', diff --git a/archaeological_context_records/migrations/0051_auto_20190904_1509.py b/archaeological_context_records/migrations/0051_auto_20190904_1509.py index d4a5562d6..083d33bf3 100644 --- a/archaeological_context_records/migrations/0051_auto_20190904_1509.py +++ b/archaeological_context_records/migrations/0051_auto_20190904_1509.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -26,8 +24,12 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(default=uuid.uuid4), ), - migrations.RunPython(set_uuid_helper('archaeological_context_records', - 'ContextRecord')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + update archaeological_context_records_contextrecord set uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='contextrecord', name='uuid', diff --git a/archaeological_finds/migrations/0070_auto_20190904_1807.py b/archaeological_finds/migrations/0070_auto_20190904_1807.py index 0accfe82c..af7a167b8 100644 --- a/archaeological_finds/migrations/0070_auto_20190904_1807.py +++ b/archaeological_finds/migrations/0070_auto_20190904_1807.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -36,10 +34,13 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(default=uuid.uuid4), ), - migrations.RunPython(set_uuid_helper('archaeological_finds', - 'BaseFind')), - migrations.RunPython(set_uuid_helper('archaeological_finds', - 'Find')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + UPDATE archaeological_finds_basefind SET uuid = uuid_generate_v1(); + UPDATE archaeological_finds_find SET uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='basefind', name='uuid', diff --git a/archaeological_finds/migrations/0071_findbasket_uuid.py b/archaeological_finds/migrations/0071_findbasket_uuid.py index 2098dfa02..0320d84c8 100644 --- a/archaeological_finds/migrations/0071_findbasket_uuid.py +++ b/archaeological_finds/migrations/0071_findbasket_uuid.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -21,8 +19,12 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('archaeological_finds', - 'FindBasket')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + UPDATE archaeological_finds_findbasket SET uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='findbasket', name='uuid', diff --git a/archaeological_operations/migrations/0061_auto_20190904_1440.py b/archaeological_operations/migrations/0061_auto_20190904_1440.py index 3c6411c27..38a54c105 100644 --- a/archaeological_operations/migrations/0061_auto_20190904_1440.py +++ b/archaeological_operations/migrations/0061_auto_20190904_1440.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -26,8 +24,12 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('archaeological_operations', - 'Operation')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + UPDATE archaeological_operations_operation SET uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='operation', name='uuid', diff --git a/archaeological_operations/migrations/0063_parcel_uuid.py b/archaeological_operations/migrations/0063_parcel_uuid.py index 1393cff0d..3af9c34af 100644 --- a/archaeological_operations/migrations/0063_parcel_uuid.py +++ b/archaeological_operations/migrations/0063_parcel_uuid.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -21,8 +19,12 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('archaeological_operations', - 'Parcel')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + UPDATE archaeological_operations_parcel SET uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='parcel', name='uuid', diff --git a/archaeological_warehouse/migrations/0041_auto_20190912_1518.py b/archaeological_warehouse/migrations/0041_auto_20190912_1518.py index f1158d9b1..b8311ef2d 100644 --- a/archaeological_warehouse/migrations/0041_auto_20190912_1518.py +++ b/archaeological_warehouse/migrations/0041_auto_20190912_1518.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -26,10 +24,13 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('archaeological_warehouse', - 'Container')), - migrations.RunPython(set_uuid_helper('archaeological_warehouse', - 'Warehouse')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + update archaeological_warehouse_container set uuid = uuid_generate_v1(); + update archaeological_warehouse_warehouse set uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='container', name='uuid', diff --git a/ishtar_common/migrations/0110_auto_20190912_1517.py b/ishtar_common/migrations/0110_auto_20190912_1517.py index f842643e7..3b7e80315 100644 --- a/ishtar_common/migrations/0110_auto_20190912_1517.py +++ b/ishtar_common/migrations/0110_auto_20190912_1517.py @@ -6,8 +6,6 @@ import uuid from django.db import migrations, models -from ishtar_common.utils_migrations import set_uuid_helper - class Migration(migrations.Migration): @@ -41,12 +39,14 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(blank=True, null=True), ), - migrations.RunPython(set_uuid_helper('ishtar_common', - 'Person')), - migrations.RunPython(set_uuid_helper('ishtar_common', - 'Organization')), - migrations.RunPython(set_uuid_helper('ishtar_common', - 'Author')), + migrations.RunSQL( + """ + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + UPDATE ishtar_common_person SET uuid = uuid_generate_v1(); + UPDATE ishtar_common_organization SET uuid = uuid_generate_v1(); + UPDATE ishtar_common_author SET uuid = uuid_generate_v1(); + """ + ), migrations.AlterField( model_name='organization', name='uuid', |