From 7e91b606bda0dce3dff1477882d10f2a73eaf1c4 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 27 Feb 2020 10:41:30 +0100 Subject: [PATCH] Fix migrations --- .../migrations/0003_auto_20200204_1331.py | 2 +- .../migrations/0010_auto_20200204_1331.py | 23 --------- .../migrations/0011_auto_20200227_0941.py | 49 +++++++++++++++++++ .../0011_user_license_expiry_date.py | 18 ------- server/users/migrations/0012_license.py | 25 ---------- .../users/migrations/0013_license_order_id.py | 18 ------- 6 files changed, 50 insertions(+), 85 deletions(-) delete mode 100644 server/users/migrations/0010_auto_20200204_1331.py create mode 100644 server/users/migrations/0011_auto_20200227_0941.py delete mode 100644 server/users/migrations/0011_user_license_expiry_date.py delete mode 100644 server/users/migrations/0012_license.py delete mode 100644 server/users/migrations/0013_license_order_id.py diff --git a/server/registration/migrations/0003_auto_20200204_1331.py b/server/registration/migrations/0003_auto_20200204_1331.py index f18bb95c..0d63ddf9 100644 --- a/server/registration/migrations/0003_auto_20200204_1331.py +++ b/server/registration/migrations/0003_auto_20200204_1331.py @@ -7,7 +7,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('users', '0010_auto_20200204_1331'), + ('users', '0010_schoolclass_code'), ('registration', '0002_auto_20191010_0905'), ] diff --git a/server/users/migrations/0010_auto_20200204_1331.py b/server/users/migrations/0010_auto_20200204_1331.py deleted file mode 100644 index 9d19221b..00000000 --- a/server/users/migrations/0010_auto_20200204_1331.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.0.6 on 2020-02-04 13:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_auto_20191009_0905'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='hep_group_id', - field=models.PositiveIntegerField(null=True), - ), - migrations.AddField( - model_name='user', - name='hep_id', - field=models.PositiveIntegerField(null=True), - ), - ] diff --git a/server/users/migrations/0011_auto_20200227_0941.py b/server/users/migrations/0011_auto_20200227_0941.py new file mode 100644 index 00000000..065a3d9d --- /dev/null +++ b/server/users/migrations/0011_auto_20200227_0941.py @@ -0,0 +1,49 @@ +# Generated by Django 2.1.15 on 2020-02-27 09:41 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0010_schoolclass_code'), + ] + + operations = [ + migrations.CreateModel( + name='License', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('expire_date', models.DateField(null=True)), + ('order_id', models.IntegerField(default=-1)), + ('raw', models.TextField(default='')), + ('for_role', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Role')), + ], + ), + migrations.AlterModelOptions( + name='schoolclass', + options={'verbose_name': 'Schulklasse', 'verbose_name_plural': 'Schulklassen'}, + ), + migrations.AddField( + model_name='user', + name='hep_group_id', + field=models.PositiveIntegerField(null=True), + ), + migrations.AddField( + model_name='user', + name='hep_id', + field=models.PositiveIntegerField(null=True), + ), + migrations.AddField( + model_name='user', + name='license_expiry_date', + field=models.DateField(default=None, null=True), + ), + migrations.AddField( + model_name='license', + name='licensee', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/server/users/migrations/0011_user_license_expiry_date.py b/server/users/migrations/0011_user_license_expiry_date.py deleted file mode 100644 index 702452d0..00000000 --- a/server/users/migrations/0011_user_license_expiry_date.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.15 on 2020-02-17 13:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_auto_20200204_1331'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='license_expiry_date', - field=models.DateField(default=None, null=True), - ), - ] diff --git a/server/users/migrations/0012_license.py b/server/users/migrations/0012_license.py deleted file mode 100644 index 30d74d9c..00000000 --- a/server/users/migrations/0012_license.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.1.15 on 2020-02-20 10:39 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0011_user_license_expiry_date'), - ] - - operations = [ - migrations.CreateModel( - name='License', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('expire_date', models.DateField(null=True)), - ('raw', models.TextField(default='')), - ('for_role', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='users.Role')), - ('licensee', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/server/users/migrations/0013_license_order_id.py b/server/users/migrations/0013_license_order_id.py deleted file mode 100644 index 072f44a8..00000000 --- a/server/users/migrations/0013_license_order_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.15 on 2020-02-20 13:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_license'), - ] - - operations = [ - migrations.AddField( - model_name='license', - name='order_id', - field=models.IntegerField(default=-1), - ), - ]