From a476b52f868e7fcd92e113d66d46cc367be409e4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 16 Oct 2021 17:45:21 +1100 Subject: [PATCH] database migrations for groups --- ...005_0935.py => 0107_auto_20211016_0639.py} | 35 +++++++++++-------- .../migrations/0107_merge_20211010_0119.py | 13 ------- 2 files changed, 21 insertions(+), 27 deletions(-) rename bookwyrm/migrations/{0106_auto_20211005_0935.py => 0107_auto_20211016_0639.py} (98%) delete mode 100644 bookwyrm/migrations/0107_merge_20211010_0119.py diff --git a/bookwyrm/migrations/0106_auto_20211005_0935.py b/bookwyrm/migrations/0107_auto_20211016_0639.py similarity index 98% rename from bookwyrm/migrations/0106_auto_20211005_0935.py rename to bookwyrm/migrations/0107_auto_20211016_0639.py index 6030c913..61dffca3 100644 --- a/bookwyrm/migrations/0106_auto_20211005_0935.py +++ b/bookwyrm/migrations/0107_auto_20211016_0639.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.5 on 2021-10-05 09:35 +# Generated by Django 3.2.5 on 2021-10-16 06:39 import bookwyrm.models.fields from django.conf import settings @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0105_alter_connector_connector_file"), + ("bookwyrm", "0106_user_preferred_language"), ] operations = [ @@ -93,16 +93,6 @@ class Migration(migrations.Migration): model_name="notification", name="notification_type_valid", ), - migrations.AddField( - model_name="notification", - name="related_group_member", - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="related_group_member", - to=settings.AUTH_USER_MODEL, - ), - ), migrations.AlterField( model_name="list", name="curation", @@ -141,6 +131,23 @@ class Migration(migrations.Migration): max_length=255, ), ), + migrations.AlterField( + model_name="user", + name="preferred_language", + field=models.CharField( + blank=True, + choices=[ + ("en-us", "English"), + ("de-de", "Deutsch (German)"), + ("es", "Español (Spanish)"), + ("fr-fr", "Français (French)"), + ("zh-hans", "简体中文 (Simplified Chinese)"), + ("zh-hant", "繁體中文 (Traditional Chinese)"), + ], + max_length=255, + null=True, + ), + ), migrations.AlterField( model_name="user", name="preferred_timezone", @@ -825,7 +832,7 @@ class Migration(migrations.Migration): model_name="group", name="user", field=bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL + on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL ), ), migrations.AddField( @@ -835,7 +842,7 @@ class Migration(migrations.Migration): blank=True, default=None, null=True, - on_delete=django.db.models.deletion.PROTECT, + on_delete=django.db.models.deletion.SET_NULL, to="bookwyrm.group", ), ), diff --git a/bookwyrm/migrations/0107_merge_20211010_0119.py b/bookwyrm/migrations/0107_merge_20211010_0119.py deleted file mode 100644 index d774fbb2..00000000 --- a/bookwyrm/migrations/0107_merge_20211010_0119.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 3.2.5 on 2021-10-10 01:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0106_auto_20211005_0935"), - ("bookwyrm", "0106_user_preferred_language"), - ] - - operations = []