From b7481b50c7ff037d472d6a5554da84999c4b1b3f Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Thu, 28 Sep 2023 01:59:59 -0700 Subject: [PATCH] merge migrations --- .../migrations/0006_userdatamodel.py | 6 ++--- .../0007_alter_userdatamodel_user.py | 24 ------------------- .../0008_alter_userdatamodel_user.py | 22 ----------------- .../0009_alter_userdatamodel_data.py | 17 ------------- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 src/reactpy_django/migrations/0007_alter_userdatamodel_user.py delete mode 100644 src/reactpy_django/migrations/0008_alter_userdatamodel_user.py delete mode 100644 src/reactpy_django/migrations/0009_alter_userdatamodel_data.py diff --git a/src/reactpy_django/migrations/0006_userdatamodel.py b/src/reactpy_django/migrations/0006_userdatamodel.py index 69e4ec31..ab762903 100644 --- a/src/reactpy_django/migrations/0006_userdatamodel.py +++ b/src/reactpy_django/migrations/0006_userdatamodel.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.5 on 2023-09-18 01:45 +# Generated by Django 4.2.5 on 2023-09-28 08:59 from django.conf import settings from django.db import migrations, models @@ -24,10 +24,10 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ("data", models.BinaryField(blank=True)), + ("data", models.BinaryField(blank=True, null=True)), ( "user", - models.ForeignKey( + models.OneToOneField( on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, ), diff --git a/src/reactpy_django/migrations/0007_alter_userdatamodel_user.py b/src/reactpy_django/migrations/0007_alter_userdatamodel_user.py deleted file mode 100644 index 7eaea2a3..00000000 --- a/src/reactpy_django/migrations/0007_alter_userdatamodel_user.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.2.5 on 2023-09-26 07:03 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("reactpy_django", "0006_userdatamodel"), - ] - - operations = [ - migrations.AlterField( - model_name="userdatamodel", - name="user", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - unique=True, - ), - ), - ] diff --git a/src/reactpy_django/migrations/0008_alter_userdatamodel_user.py b/src/reactpy_django/migrations/0008_alter_userdatamodel_user.py deleted file mode 100644 index ee31c2fe..00000000 --- a/src/reactpy_django/migrations/0008_alter_userdatamodel_user.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 4.2.5 on 2023-09-26 07:04 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("reactpy_django", "0007_alter_userdatamodel_user"), - ] - - operations = [ - migrations.AlterField( - model_name="userdatamodel", - name="user", - field=models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL - ), - ), - ] diff --git a/src/reactpy_django/migrations/0009_alter_userdatamodel_data.py b/src/reactpy_django/migrations/0009_alter_userdatamodel_data.py deleted file mode 100644 index 47b731b6..00000000 --- a/src/reactpy_django/migrations/0009_alter_userdatamodel_data.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.5 on 2023-09-26 07:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("reactpy_django", "0008_alter_userdatamodel_user"), - ] - - operations = [ - migrations.AlterField( - model_name="userdatamodel", - name="data", - field=models.BinaryField(blank=True, null=True), - ), - ]