From 601cafe9e26c928a1bde729742975527f12d57f7 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Thu, 8 Jul 2021 14:26:22 -0400 Subject: [PATCH 01/12] Created Migration 03 branch. --- migrations/0004_auto_20210708_1317.py | 28 +++++++++++++++++++++++++++ migrations/testmodel_created_by.py | 23 ++++++++++++++++++++++ models.py | 4 ++++ 3 files changed, 55 insertions(+) create mode 100644 migrations/0004_auto_20210708_1317.py create mode 100644 migrations/testmodel_created_by.py diff --git a/migrations/0004_auto_20210708_1317.py b/migrations/0004_auto_20210708_1317.py new file mode 100644 index 0000000..33cd825 --- /dev/null +++ b/migrations/0004_auto_20210708_1317.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2021-07-08 13:17 +from __future__ import unicode_literals + +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), + ('demo', 'testmodel_created_by'), + ] + + operations = [ + migrations.AddField( + model_name='testmodel', + name='updated_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='testmodel', + name='created_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/migrations/testmodel_created_by.py b/migrations/testmodel_created_by.py new file mode 100644 index 0000000..bf8b941 --- /dev/null +++ b/migrations/testmodel_created_by.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2021-07-08 13:04 +from __future__ import unicode_literals + +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), + ('demo', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='testmodel', + name='created_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/models.py b/models.py index 2973db3..db70ba3 100644 --- a/models.py +++ b/models.py @@ -1,4 +1,5 @@ import django +from django.conf import settings from django.db import models from django.utils.translation import gettext_lazy as _ @@ -9,6 +10,9 @@ class TestModel(models.Model): name = models.CharField(max_length=500) age = models.PositiveIntegerField(default=500) + created_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+') + updated_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+') + if django.VERSION < (2, 1): active = models.NullBooleanField() else: From 54832ecf344f49ba832a5b8c7fbcab5995cddab4 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Thu, 8 Jul 2021 14:42:27 -0400 Subject: [PATCH 02/12] Updated file names. --- .../{testmodel_created_by.py => 0002_testmodel_created_by.py} | 0 .../{0004_auto_20210708_1317.py => 0003_auto_20210708_1317.py} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename migrations/{testmodel_created_by.py => 0002_testmodel_created_by.py} (100%) rename migrations/{0004_auto_20210708_1317.py => 0003_auto_20210708_1317.py} (94%) diff --git a/migrations/testmodel_created_by.py b/migrations/0002_testmodel_created_by.py similarity index 100% rename from migrations/testmodel_created_by.py rename to migrations/0002_testmodel_created_by.py diff --git a/migrations/0004_auto_20210708_1317.py b/migrations/0003_auto_20210708_1317.py similarity index 94% rename from migrations/0004_auto_20210708_1317.py rename to migrations/0003_auto_20210708_1317.py index 33cd825..8d75679 100644 --- a/migrations/0004_auto_20210708_1317.py +++ b/migrations/0003_auto_20210708_1317.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('demo', 'testmodel_created_by'), + ('demo', '0002_testmodel_created_by'), ] operations = [ From cc0ea0c176355de6b4f14c3bf67e4e1b00bb9f15 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Thu, 8 Jul 2021 16:46:08 -0400 Subject: [PATCH 03/12] Updated migration. --- migrations/0003_auto_20210708_1317.py | 2 +- .../{0002_testmodel_created_by.py => testmodel_created_by.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename migrations/{0002_testmodel_created_by.py => testmodel_created_by.py} (100%) diff --git a/migrations/0003_auto_20210708_1317.py b/migrations/0003_auto_20210708_1317.py index 8d75679..33cd825 100644 --- a/migrations/0003_auto_20210708_1317.py +++ b/migrations/0003_auto_20210708_1317.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('demo', '0002_testmodel_created_by'), + ('demo', 'testmodel_created_by'), ] operations = [ diff --git a/migrations/0002_testmodel_created_by.py b/migrations/testmodel_created_by.py similarity index 100% rename from migrations/0002_testmodel_created_by.py rename to migrations/testmodel_created_by.py From ec5b8ab3ece019960527d38d3798973aa05852f7 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 11:51:46 -0400 Subject: [PATCH 04/12] Updated model. --- models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models.py b/models.py index db70ba3..9f285c0 100644 --- a/models.py +++ b/models.py @@ -10,8 +10,8 @@ class TestModel(models.Model): name = models.CharField(max_length=500) age = models.PositiveIntegerField(default=500) - created_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+') - updated_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+') + created_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+', on_delete=models.CASCADE) + updated_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+', on_delete=models.CASCADE) if django.VERSION < (2, 1): active = models.NullBooleanField() From f270215a26d162a5250c5a1b4e89fcaa353dacec Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:14:55 -0400 Subject: [PATCH 05/12] Updated migration --- .../{testmodel_created_by.py => 0003_testmodel_created_by.py} | 0 .../{0003_auto_20210708_1317.py => 0004_auto_20210708_1317.py} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename migrations/{testmodel_created_by.py => 0003_testmodel_created_by.py} (100%) rename migrations/{0003_auto_20210708_1317.py => 0004_auto_20210708_1317.py} (94%) diff --git a/migrations/testmodel_created_by.py b/migrations/0003_testmodel_created_by.py similarity index 100% rename from migrations/testmodel_created_by.py rename to migrations/0003_testmodel_created_by.py diff --git a/migrations/0003_auto_20210708_1317.py b/migrations/0004_auto_20210708_1317.py similarity index 94% rename from migrations/0003_auto_20210708_1317.py rename to migrations/0004_auto_20210708_1317.py index 33cd825..a14a3e0 100644 --- a/migrations/0003_auto_20210708_1317.py +++ b/migrations/0004_auto_20210708_1317.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('demo', 'testmodel_created_by'), + ('demo', '0003_testmodel_created_by'), ] operations = [ From 9ed9d120bd085de0c7ee948ef318f79c24b8a131 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:16:18 -0400 Subject: [PATCH 06/12] Updated migration --- migrations/0003_testmodel_created_by.py | 23 -------------------- migrations/0004_auto_20210708_1317.py | 28 ------------------------- 2 files changed, 51 deletions(-) delete mode 100644 migrations/0003_testmodel_created_by.py delete mode 100644 migrations/0004_auto_20210708_1317.py diff --git a/migrations/0003_testmodel_created_by.py b/migrations/0003_testmodel_created_by.py deleted file mode 100644 index bf8b941..0000000 --- a/migrations/0003_testmodel_created_by.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2021-07-08 13:04 -from __future__ import unicode_literals - -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), - ('demo', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='testmodel', - name='created_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/migrations/0004_auto_20210708_1317.py b/migrations/0004_auto_20210708_1317.py deleted file mode 100644 index a14a3e0..0000000 --- a/migrations/0004_auto_20210708_1317.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2021-07-08 13:17 -from __future__ import unicode_literals - -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), - ('demo', '0003_testmodel_created_by'), - ] - - operations = [ - migrations.AddField( - model_name='testmodel', - name='updated_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='testmodel', - name='created_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), - ), - ] From 7141cf9812291f2c58ff22116a0b4049c91f555f Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:16:25 -0400 Subject: [PATCH 07/12] Updated migration --- migrations/0002_testmodel_created_by.py | 23 ++++++++++++++++++++ migrations/0003_auto_20210708_1317.py | 28 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 migrations/0002_testmodel_created_by.py create mode 100644 migrations/0003_auto_20210708_1317.py diff --git a/migrations/0002_testmodel_created_by.py b/migrations/0002_testmodel_created_by.py new file mode 100644 index 0000000..bf8b941 --- /dev/null +++ b/migrations/0002_testmodel_created_by.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2021-07-08 13:04 +from __future__ import unicode_literals + +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), + ('demo', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='testmodel', + name='created_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/migrations/0003_auto_20210708_1317.py b/migrations/0003_auto_20210708_1317.py new file mode 100644 index 0000000..8d75679 --- /dev/null +++ b/migrations/0003_auto_20210708_1317.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2021-07-08 13:17 +from __future__ import unicode_literals + +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), + ('demo', '0002_testmodel_created_by'), + ] + + operations = [ + migrations.AddField( + model_name='testmodel', + name='updated_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='testmodel', + name='created_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + ), + ] From 79547d7e9e7993638c449dc9fe2a154781f27f11 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 9 Jul 2021 16:17:48 +0000 Subject: [PATCH 08/12] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- migrations/0002_testmodel_created_by.py | 14 ++++++++----- migrations/0003_auto_20210708_1317.py | 26 +++++++++++++++++-------- models.py | 8 ++++++-- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/migrations/0002_testmodel_created_by.py b/migrations/0002_testmodel_created_by.py index bf8b941..b159696 100644 --- a/migrations/0002_testmodel_created_by.py +++ b/migrations/0002_testmodel_created_by.py @@ -2,22 +2,26 @@ # Generated by Django 1.11.29 on 2021-07-08 13:04 from __future__ import unicode_literals +import django.db.models.deletion 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), - ('demo', '0001_initial'), + ("demo", "0001_initial"), ] operations = [ migrations.AddField( - model_name='testmodel', - name='created_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + model_name="testmodel", + name="created_by", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), ), ] diff --git a/migrations/0003_auto_20210708_1317.py b/migrations/0003_auto_20210708_1317.py index 8d75679..b7d42be 100644 --- a/migrations/0003_auto_20210708_1317.py +++ b/migrations/0003_auto_20210708_1317.py @@ -2,27 +2,37 @@ # Generated by Django 1.11.29 on 2021-07-08 13:17 from __future__ import unicode_literals +import django.db.models.deletion 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), - ('demo', '0002_testmodel_created_by'), + ("demo", "0002_testmodel_created_by"), ] operations = [ migrations.AddField( - model_name='testmodel', - name='updated_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + model_name="testmodel", + name="updated_by", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="+", + to=settings.AUTH_USER_MODEL, + ), ), migrations.AlterField( - model_name='testmodel', - name='created_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL), + model_name="testmodel", + name="created_by", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="+", + to=settings.AUTH_USER_MODEL, + ), ), ] diff --git a/models.py b/models.py index 9f285c0..b649a2c 100644 --- a/models.py +++ b/models.py @@ -10,8 +10,12 @@ class TestModel(models.Model): name = models.CharField(max_length=500) age = models.PositiveIntegerField(default=500) - created_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+', on_delete=models.CASCADE) - updated_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, related_name='+', on_delete=models.CASCADE) + created_by = models.ForeignKey( + settings.AUTH_USER_MODEL, null=True, related_name="+", on_delete=models.CASCADE + ) + updated_by = models.ForeignKey( + settings.AUTH_USER_MODEL, null=True, related_name="+", on_delete=models.CASCADE + ) if django.VERSION < (2, 1): active = models.NullBooleanField() From b19e1899a36b9105feb8bec4494b432ff8638b9c Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:18:29 -0400 Subject: [PATCH 09/12] Update models.py Co-authored-by: django-doctor[bot] <72320148+django-doctor[bot]@users.noreply.github.com> --- models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/models.py b/models.py index b649a2c..6589591 100644 --- a/models.py +++ b/models.py @@ -11,7 +11,11 @@ class TestModel(models.Model): age = models.PositiveIntegerField(default=500) created_by = models.ForeignKey( - settings.AUTH_USER_MODEL, null=True, related_name="+", on_delete=models.CASCADE + settings.AUTH_USER_MODEL, + null=True, + related_name="+", + on_delete=models.CASCADE, + blank=True, ) updated_by = models.ForeignKey( settings.AUTH_USER_MODEL, null=True, related_name="+", on_delete=models.CASCADE From 4b7a8b5321159b2d67730058e6151019e87efe91 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:18:41 -0400 Subject: [PATCH 10/12] Update models.py Co-authored-by: django-doctor[bot] <72320148+django-doctor[bot]@users.noreply.github.com> --- models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/models.py b/models.py index 6589591..0c6dfcf 100644 --- a/models.py +++ b/models.py @@ -18,7 +18,11 @@ class TestModel(models.Model): blank=True, ) updated_by = models.ForeignKey( - settings.AUTH_USER_MODEL, null=True, related_name="+", on_delete=models.CASCADE + settings.AUTH_USER_MODEL, + null=True, + related_name="+", + on_delete=models.CASCADE, + blank=True, ) if django.VERSION < (2, 1): From 6c2d3b672d0751fc2a6a872cea11cdd056b0c63f Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:19:20 -0400 Subject: [PATCH 11/12] Update 0002_testmodel_created_by.py --- migrations/0002_testmodel_created_by.py | 1 + 1 file changed, 1 insertion(+) diff --git a/migrations/0002_testmodel_created_by.py b/migrations/0002_testmodel_created_by.py index b159696..807de68 100644 --- a/migrations/0002_testmodel_created_by.py +++ b/migrations/0002_testmodel_created_by.py @@ -20,6 +20,7 @@ class Migration(migrations.Migration): name="created_by", field=models.ForeignKey( null=True, + blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, ), From f4798130ae0f87df144d2a1d21e574b6765cac34 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 9 Jul 2021 12:19:37 -0400 Subject: [PATCH 12/12] Update 0003_auto_20210708_1317.py --- migrations/0003_auto_20210708_1317.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migrations/0003_auto_20210708_1317.py b/migrations/0003_auto_20210708_1317.py index b7d42be..cbc0878 100644 --- a/migrations/0003_auto_20210708_1317.py +++ b/migrations/0003_auto_20210708_1317.py @@ -20,6 +20,7 @@ class Migration(migrations.Migration): name="updated_by", field=models.ForeignKey( null=True, + blank=True, on_delete=django.db.models.deletion.CASCADE, related_name="+", to=settings.AUTH_USER_MODEL, @@ -30,6 +31,7 @@ class Migration(migrations.Migration): name="created_by", field=models.ForeignKey( null=True, + blank=True, on_delete=django.db.models.deletion.CASCADE, related_name="+", to=settings.AUTH_USER_MODEL,