From 37cf8ede49a7bd917136f91b7c53ac49adeec944 Mon Sep 17 00:00:00 2001 From: Xander Vertegaal Date: Wed, 27 Mar 2024 21:10:47 +0100 Subject: [PATCH] Recreate migrations --- ...ase_remove_letteraction_actors_and_more.py | 118 --------- ...10_remove_letteraction_actors_and_more.py} | 223 ++++++++--------- ...tionbase_gifts_letteractionbase_letters.py | 33 --- ...ractionbase_space_descriptions_and_more.py | 84 ------- ...erbase_remove_gift_description_and_more.py | 227 +++++++++++++++++- ..._agent_gender_group_constraint_and_more.py | 2 +- .../migrations/0004_delete_reference.py | 2 +- ...ription_ecclesiastical_regions_and_more.py | 49 ---- ... => 0002_spacedescriptionbase_and_more.py} | 4 +- 9 files changed, 328 insertions(+), 414 deletions(-) delete mode 100644 backend/event/migrations/0010_letteractionbase_remove_letteraction_actors_and_more.py rename backend/{letter/migrations/0010_alter_letteraddressees_addressees_and_more.py => event/migrations/0010_remove_letteraction_actors_and_more.py} (51%) delete mode 100644 backend/event/migrations/0011_letteractionbase_gifts_letteractionbase_letters.py delete mode 100644 backend/event/migrations/0012_letteractionbase_space_descriptions_and_more.py delete mode 100644 backend/space/migrations/0002_alter_spacedescription_ecclesiastical_regions_and_more.py rename backend/space/migrations/{0003_spacedescriptionbase_and_more.py => 0002_spacedescriptionbase_and_more.py} (98%) diff --git a/backend/event/migrations/0010_letteractionbase_remove_letteraction_actors_and_more.py b/backend/event/migrations/0010_letteractionbase_remove_letteraction_actors_and_more.py deleted file mode 100644 index 5db57d2b..00000000 --- a/backend/event/migrations/0010_letteractionbase_remove_letteraction_actors_and_more.py +++ /dev/null @@ -1,118 +0,0 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 - -import django.contrib.postgres.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ("person", "0011_alter_agent_gender_alter_agent_is_group_and_more"), - ("event", "0009_letteraction_space_descriptions"), - ] - - operations = [ - migrations.CreateModel( - name="LetterActionBase", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "actors", - models.ManyToManyField( - related_name="events", through="event.Role", to="person.agent" - ), - ), - ( - "epistolary_events", - models.ManyToManyField( - help_text="epistolary events this letter action belongs to", - related_name="letter_actions", - to="event.epistolaryevent", - ), - ), - ], - ), - migrations.RemoveField( - model_name="letteraction", - name="actors", - ), - migrations.RemoveField( - model_name="letteraction", - name="epistolary_events", - ), - migrations.RemoveField( - model_name="letteraction", - name="gifts", - ), - migrations.RemoveField( - model_name="letteraction", - name="id", - ), - migrations.RemoveField( - model_name="letteraction", - name="letters", - ), - migrations.RemoveField( - model_name="letteraction", - name="space_descriptions", - ), - migrations.CreateModel( - name="LetterActionDescription", - fields=[ - ( - "letteractionbase_ptr", - models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="event.letteractionbase", - ), - ), - ( - "location", - models.CharField( - blank=True, - help_text="Specific location of the reference in the source text", - max_length=200, - ), - ), - ( - "terminology", - django.contrib.postgres.fields.ArrayField( - base_field=models.CharField(max_length=200), - blank=True, - default=list, - help_text="Terminology used in the source text to describe this entity", - size=5, - ), - ), - ( - "mention", - models.CharField( - blank=True, - choices=[ - ("direct", "directly mentioned"), - ("implied", "implied"), - ], - help_text="How is this information presented in the text?", - max_length=32, - ), - ), - ], - options={ - "abstract": False, - }, - bases=("event.letteractionbase", models.Model), - ), - ] diff --git a/backend/letter/migrations/0010_alter_letteraddressees_addressees_and_more.py b/backend/event/migrations/0010_remove_letteraction_actors_and_more.py similarity index 51% rename from backend/letter/migrations/0010_alter_letteraddressees_addressees_and_more.py rename to backend/event/migrations/0010_remove_letteraction_actors_and_more.py index d9ac937a..e7dced7b 100644 --- a/backend/letter/migrations/0010_alter_letteraddressees_addressees_and_more.py +++ b/backend/event/migrations/0010_remove_letteraction_actors_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 +# Generated by Django 4.2.7 on 2024-03-27 20:07 import django.contrib.postgres.fields from django.db import migrations, models @@ -8,178 +8,151 @@ class Migration(migrations.Migration): dependencies = [ - ("source", "0004_delete_reference"), ("person", "0012_agentbase_remove_agent_gender_group_constraint_and_more"), ("letter", "0009_giftbase_letterbase_remove_gift_description_and_more"), + ("source", "0004_delete_reference"), + ("space", "0002_spacedescriptionbase_and_more"), + ("event", "0009_letteraction_space_descriptions"), ] operations = [ - migrations.AlterField( - model_name="letteraddressees", - name="addressees", - field=models.ManyToManyField( - blank=True, - help_text="Agents whom the letter names as the addressee", - to="person.agentbase", - ), + migrations.RemoveField( + model_name="letteraction", + name="actors", ), - migrations.AlterField( - model_name="lettersenders", - name="senders", - field=models.ManyToManyField( - blank=True, - help_text="Agents whom the letter names as the sender", - to="person.agentbase", - ), + migrations.RemoveField( + model_name="letteraction", + name="epistolary_events", ), - migrations.AddField( - model_name="giftbase", - name="gifted_by", - field=models.ForeignKey( - blank=True, - help_text="The agent who gave the gift. Leave empty if unknown.", - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="gifts_given", - to="person.agentbase", - ), + migrations.RemoveField( + model_name="letteraction", + name="gifts", ), - migrations.AddField( - model_name="gift", - name="giftbase_ptr", - field=models.OneToOneField( - auto_created=True, - default=1, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="letter.giftbase", - ), - preserve_default=False, + migrations.RemoveField( + model_name="letteraction", + name="id", ), - migrations.AddField( - model_name="letter", - name="letterbase_ptr", - field=models.OneToOneField( - auto_created=True, - default=1, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="letter.letterbase", - ), - preserve_default=False, - ), - migrations.AlterField( - model_name="letteraddressees", - name="letter", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" - ), - ), - migrations.AlterField( - model_name="lettercategory", - name="letter", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" - ), + migrations.RemoveField( + model_name="letteraction", + name="letters", ), - migrations.AlterField( - model_name="lettermaterial", - name="letter", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" - ), + migrations.RemoveField( + model_name="letteraction", + name="space_descriptions", ), migrations.AlterField( - model_name="lettersenders", - name="letter", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" + model_name="role", + name="agent", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="person.agentbase" ), ), migrations.CreateModel( - name="LetterDescription", + name="LetterActionBase", fields=[ ( - "letterbase_ptr", - models.OneToOneField( + "id", + models.BigAutoField( auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, primary_key=True, serialize=False, - to="letter.letterbase", + verbose_name="ID", ), ), ( - "location", - models.CharField( - blank=True, - help_text="Specific location of the reference in the source text", - max_length=200, + "actors", + models.ManyToManyField( + related_name="events", + through="event.Role", + to="person.agentbase", ), ), ( - "terminology", - django.contrib.postgres.fields.ArrayField( - base_field=models.CharField(max_length=200), - blank=True, - default=list, - help_text="Terminology used in the source text to describe this entity", - size=5, + "epistolary_events", + models.ManyToManyField( + help_text="epistolary events this letter action belongs to", + related_name="letter_actions", + to="event.epistolaryevent", ), ), ( - "mention", - models.CharField( + "gifts", + models.ManyToManyField( blank=True, - choices=[ - ("direct", "directly mentioned"), - ("implied", "implied"), - ], - help_text="How is this information presented in the text?", - max_length=32, + help_text="Gifts associated to this letter action", + related_name="letter_actions", + to="letter.giftbase", ), ), ( - "source", - models.ForeignKey( - help_text="The source in which this description occurs.", - on_delete=django.db.models.deletion.CASCADE, - to="source.source", + "letters", + models.ManyToManyField( + help_text="letters involved in this event", + related_name="events", + to="letter.letterbase", ), ), ( - "target", - models.ForeignKey( + "space_descriptions", + models.ManyToManyField( blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="source_descriptions", - to="letter.letter", + help_text="Descriptions of the space in which this action took place", + to="space.spacedescriptionbase", ), ), ], - options={ - "abstract": False, - }, - bases=("letter.letterbase", models.Model), + ), + migrations.AddField( + model_name="letteraction", + name="letteractionbase_ptr", + field=models.OneToOneField( + auto_created=True, + default=1, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="event.letteractionbase", + ), + preserve_default=False, + ), + migrations.AlterField( + model_name="letteractioncategory", + name="letter_action", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="categories", + to="event.letteractionbase", + ), + ), + migrations.AlterField( + model_name="lettereventdate", + name="letter_action", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="date", + to="event.letteractionbase", + ), + ), + migrations.AlterField( + model_name="role", + name="letter_action", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="event.letteractionbase" + ), ), migrations.CreateModel( - name="GiftDescription", + name="LetterActionDescription", fields=[ ( - "giftbase_ptr", + "letteractionbase_ptr", models.OneToOneField( auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, - to="letter.giftbase", + to="event.letteractionbase", ), ), ( @@ -227,13 +200,13 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.CASCADE, related_name="source_descriptions", - to="letter.giftbase", + to="event.letteraction", ), ), ], options={ "abstract": False, }, - bases=("letter.giftbase", models.Model), + bases=("event.letteractionbase", models.Model), ), ] diff --git a/backend/event/migrations/0011_letteractionbase_gifts_letteractionbase_letters.py b/backend/event/migrations/0011_letteractionbase_gifts_letteractionbase_letters.py deleted file mode 100644 index 18eeca1c..00000000 --- a/backend/event/migrations/0011_letteractionbase_gifts_letteractionbase_letters.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("event", "0010_letteractionbase_remove_letteraction_actors_and_more"), - ("letter", "0009_giftbase_letterbase_remove_gift_description_and_more"), - ] - - operations = [ - migrations.AddField( - model_name="letteractionbase", - name="gifts", - field=models.ManyToManyField( - blank=True, - help_text="Gifts associated to this letter action", - related_name="letter_actions", - to="letter.giftbase", - ), - ), - migrations.AddField( - model_name="letteractionbase", - name="letters", - field=models.ManyToManyField( - help_text="letters involved in this event", - related_name="events", - to="letter.letterbase", - ), - ), - ] diff --git a/backend/event/migrations/0012_letteractionbase_space_descriptions_and_more.py b/backend/event/migrations/0012_letteractionbase_space_descriptions_and_more.py deleted file mode 100644 index 94ab814e..00000000 --- a/backend/event/migrations/0012_letteractionbase_space_descriptions_and_more.py +++ /dev/null @@ -1,84 +0,0 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ("source", "0004_delete_reference"), - ("space", "0003_spacedescriptionbase_and_more"), - ("event", "0011_letteractionbase_gifts_letteractionbase_letters"), - ] - - operations = [ - migrations.AddField( - model_name="letteractionbase", - name="space_descriptions", - field=models.ManyToManyField( - blank=True, - help_text="Descriptions of the space in which this action took place", - to="space.spacedescriptionbase", - ), - ), - migrations.AddField( - model_name="letteraction", - name="letteractionbase_ptr", - field=models.OneToOneField( - auto_created=True, - default=1, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="event.letteractionbase", - ), - preserve_default=False, - ), - migrations.AlterField( - model_name="letteractioncategory", - name="letter_action", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="categories", - to="event.letteractionbase", - ), - ), - migrations.AlterField( - model_name="lettereventdate", - name="letter_action", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - related_name="date", - to="event.letteractionbase", - ), - ), - migrations.AlterField( - model_name="role", - name="letter_action", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="event.letteractionbase" - ), - ), - migrations.AddField( - model_name="letteractiondescription", - name="source", - field=models.ForeignKey( - help_text="The source in which this description occurs.", - on_delete=django.db.models.deletion.CASCADE, - to="source.source", - ), - ), - migrations.AddField( - model_name="letteractiondescription", - name="target", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="source_descriptions", - to="event.letteraction", - ), - ), - ] diff --git a/backend/letter/migrations/0009_giftbase_letterbase_remove_gift_description_and_more.py b/backend/letter/migrations/0009_giftbase_letterbase_remove_gift_description_and_more.py index c41e0ebb..a2646f9b 100644 --- a/backend/letter/migrations/0009_giftbase_letterbase_remove_gift_description_and_more.py +++ b/backend/letter/migrations/0009_giftbase_letterbase_remove_gift_description_and_more.py @@ -1,11 +1,15 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 +# Generated by Django 4.2.7 on 2024-03-27 20:07 +import django.contrib.postgres.fields from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ + ("person", "0012_agentbase_remove_agent_gender_group_constraint_and_more"), + ("source", "0004_delete_reference"), ("letter", "0008_alter_gift_gifted_by_and_more"), ] @@ -53,6 +57,17 @@ class Migration(migrations.Migration): help_text="The material the gift consists of", ), ), + ( + "gifted_by", + models.ForeignKey( + blank=True, + help_text="The agent who gave the gift. Leave empty if unknown.", + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="gifts_given", + to="person.agentbase", + ), + ), ], ), migrations.CreateModel( @@ -105,4 +120,214 @@ class Migration(migrations.Migration): model_name="letter", name="name", ), + migrations.AlterField( + model_name="letteraddressees", + name="addressees", + field=models.ManyToManyField( + blank=True, + help_text="Agents whom the letter names as the addressee", + to="person.agentbase", + ), + ), + migrations.AlterField( + model_name="lettersenders", + name="senders", + field=models.ManyToManyField( + blank=True, + help_text="Agents whom the letter names as the sender", + to="person.agentbase", + ), + ), + migrations.AddField( + model_name="gift", + name="giftbase_ptr", + field=models.OneToOneField( + auto_created=True, + default=1, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="letter.giftbase", + ), + preserve_default=False, + ), + migrations.AddField( + model_name="letter", + name="letterbase_ptr", + field=models.OneToOneField( + auto_created=True, + default=1, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="letter.letterbase", + ), + preserve_default=False, + ), + migrations.AlterField( + model_name="letteraddressees", + name="letter", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" + ), + ), + migrations.AlterField( + model_name="lettercategory", + name="letter", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" + ), + ), + migrations.AlterField( + model_name="lettermaterial", + name="letter", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" + ), + ), + migrations.AlterField( + model_name="lettersenders", + name="letter", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, to="letter.letterbase" + ), + ), + migrations.CreateModel( + name="LetterDescription", + fields=[ + ( + "letterbase_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="letter.letterbase", + ), + ), + ( + "location", + models.CharField( + blank=True, + help_text="Specific location of the reference in the source text", + max_length=200, + ), + ), + ( + "terminology", + django.contrib.postgres.fields.ArrayField( + base_field=models.CharField(max_length=200), + blank=True, + default=list, + help_text="Terminology used in the source text to describe this entity", + size=5, + ), + ), + ( + "mention", + models.CharField( + blank=True, + choices=[ + ("direct", "directly mentioned"), + ("implied", "implied"), + ], + help_text="How is this information presented in the text?", + max_length=32, + ), + ), + ( + "source", + models.ForeignKey( + help_text="The source in which this description occurs.", + on_delete=django.db.models.deletion.CASCADE, + to="source.source", + ), + ), + ( + "target", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="source_descriptions", + to="letter.letter", + ), + ), + ], + options={ + "abstract": False, + }, + bases=("letter.letterbase", models.Model), + ), + migrations.CreateModel( + name="GiftDescription", + fields=[ + ( + "giftbase_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="letter.giftbase", + ), + ), + ( + "location", + models.CharField( + blank=True, + help_text="Specific location of the reference in the source text", + max_length=200, + ), + ), + ( + "terminology", + django.contrib.postgres.fields.ArrayField( + base_field=models.CharField(max_length=200), + blank=True, + default=list, + help_text="Terminology used in the source text to describe this entity", + size=5, + ), + ), + ( + "mention", + models.CharField( + blank=True, + choices=[ + ("direct", "directly mentioned"), + ("implied", "implied"), + ], + help_text="How is this information presented in the text?", + max_length=32, + ), + ), + ( + "source", + models.ForeignKey( + help_text="The source in which this description occurs.", + on_delete=django.db.models.deletion.CASCADE, + to="source.source", + ), + ), + ( + "target", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="source_descriptions", + to="letter.giftbase", + ), + ), + ], + options={ + "abstract": False, + }, + bases=("letter.giftbase", models.Model), + ), ] diff --git a/backend/person/migrations/0012_agentbase_remove_agent_gender_group_constraint_and_more.py b/backend/person/migrations/0012_agentbase_remove_agent_gender_group_constraint_and_more.py index 01688717..eec42024 100644 --- a/backend/person/migrations/0012_agentbase_remove_agent_gender_group_constraint_and_more.py +++ b/backend/person/migrations/0012_agentbase_remove_agent_gender_group_constraint_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 +# Generated by Django 4.2.7 on 2024-03-27 20:07 import django.contrib.postgres.fields from django.db import migrations, models diff --git a/backend/source/migrations/0004_delete_reference.py b/backend/source/migrations/0004_delete_reference.py index 7e673dc8..43b20155 100644 --- a/backend/source/migrations/0004_delete_reference.py +++ b/backend/source/migrations/0004_delete_reference.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-03-24 09:08 +# Generated by Django 4.2.7 on 2024-03-27 20:07 from django.db import migrations diff --git a/backend/space/migrations/0002_alter_spacedescription_ecclesiastical_regions_and_more.py b/backend/space/migrations/0002_alter_spacedescription_ecclesiastical_regions_and_more.py deleted file mode 100644 index 2d0ffdcd..00000000 --- a/backend/space/migrations/0002_alter_spacedescription_ecclesiastical_regions_and_more.py +++ /dev/null @@ -1,49 +0,0 @@ -# Generated by Django 4.2.7 on 2024-03-24 09:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("space", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="spacedescription", - name="ecclesiastical_regions", - field=models.ManyToManyField( - help_text="Ecclesiastical regions referenced in this description", - through="space.EcclesiasticalRegionField", - to="space.ecclesiasticalregion", - ), - ), - migrations.AlterField( - model_name="spacedescription", - name="geographical_regions", - field=models.ManyToManyField( - help_text="Geographical regions referenced in this description", - through="space.GeographicalRegionField", - to="space.geographicalregion", - ), - ), - migrations.AlterField( - model_name="spacedescription", - name="political_regions", - field=models.ManyToManyField( - help_text="Political regions referenced in this description", - through="space.PoliticalRegionField", - to="space.politicalregion", - ), - ), - migrations.AlterField( - model_name="spacedescription", - name="structures", - field=models.ManyToManyField( - help_text="Man-made structures referenced in this description", - through="space.StructureField", - to="space.structure", - ), - ), - ] diff --git a/backend/space/migrations/0003_spacedescriptionbase_and_more.py b/backend/space/migrations/0002_spacedescriptionbase_and_more.py similarity index 98% rename from backend/space/migrations/0003_spacedescriptionbase_and_more.py rename to backend/space/migrations/0002_spacedescriptionbase_and_more.py index 238922a7..7a5847c3 100644 --- a/backend/space/migrations/0003_spacedescriptionbase_and_more.py +++ b/backend/space/migrations/0002_spacedescriptionbase_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-03-27 10:53 +# Generated by Django 4.2.7 on 2024-03-27 20:07 import django.contrib.postgres.fields from django.db import migrations, models @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ("source", "0004_delete_reference"), - ("space", "0002_alter_spacedescription_ecclesiastical_regions_and_more"), + ("space", "0001_initial"), ] operations = [