From 23563651974d1080cf19698ec68ee3f19bd8164e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 26 Sep 2019 20:52:11 +0300 Subject: [PATCH] Reconstruct migrations (squash merge request) --- webapp/migrations/0055_auto_20190926_1850.py | 31 ----------- webapp/migrations/0055_auto_20190926_2048.py | 19 +++++++ webapp/migrations/0056_auto_20190926_1857.py | 51 ----------------- webapp/migrations/0056_auto_20190926_2051.py | 58 ++++++++++++++++++++ webapp/migrations/0057_auto_20190926_1915.py | 18 ------ webapp/migrations/0058_auto_20190926_2010.py | 31 ----------- webapp/migrations/0059_auto_20190926_2032.py | 23 -------- 7 files changed, 77 insertions(+), 154 deletions(-) delete mode 100644 webapp/migrations/0055_auto_20190926_1850.py create mode 100644 webapp/migrations/0055_auto_20190926_2048.py delete mode 100644 webapp/migrations/0056_auto_20190926_1857.py create mode 100644 webapp/migrations/0056_auto_20190926_2051.py delete mode 100644 webapp/migrations/0057_auto_20190926_1915.py delete mode 100644 webapp/migrations/0058_auto_20190926_2010.py delete mode 100644 webapp/migrations/0059_auto_20190926_2032.py diff --git a/webapp/migrations/0055_auto_20190926_1850.py b/webapp/migrations/0055_auto_20190926_1850.py deleted file mode 100644 index a1fb4ff..0000000 --- a/webapp/migrations/0055_auto_20190926_1850.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-26 15:50 - -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), - ('webapp', '0054_auto_20190313_1642'), - ] - - operations = [ - migrations.CreateModel( - name='Occupation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(verbose_name='Start date')), - ('end_date', models.DateField(verbose_name='End date')), - ], - options={ - 'verbose_name': 'Occupation', - 'verbose_name_plural': 'Occupations', - }, - ), - migrations.DeleteModel( - name='official' - ) - ] diff --git a/webapp/migrations/0055_auto_20190926_2048.py b/webapp/migrations/0055_auto_20190926_2048.py new file mode 100644 index 0000000..36f40e0 --- /dev/null +++ b/webapp/migrations/0055_auto_20190926_2048.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1.5 on 2019-09-26 17:48 + +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), + ('webapp', '0054_auto_20190313_1642'), + ] + + operations = [ + migrations.DeleteModel( + name='official' + ) + ] diff --git a/webapp/migrations/0056_auto_20190926_1857.py b/webapp/migrations/0056_auto_20190926_1857.py deleted file mode 100644 index 6f99cba..0000000 --- a/webapp/migrations/0056_auto_20190926_1857.py +++ /dev/null @@ -1,51 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-26 15:57 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import phonenumber_field.modelfields - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('webapp', '0055_auto_20190926_1850'), - ] - - operations = [ - migrations.CreateModel( - name='Official', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('phone_number', phonenumber_field.modelfields.PhoneNumberField(max_length=128, verbose_name='Phone number')), - ], - options={ - 'verbose_name': 'Official', - 'verbose_name_plural': 'Officials', - }, - ), - migrations.RemoveField( - model_name='role', - name='end_date', - ), - migrations.RemoveField( - model_name='role', - name='start_date', - ), - migrations.AddField( - model_name='occupation', - name='occupation', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='webapp.Role'), - ), - migrations.AddField( - model_name='official', - name='role_history', - field=models.ManyToManyField(to='webapp.Occupation'), - ), - migrations.AddField( - model_name='official', - name='user', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/webapp/migrations/0056_auto_20190926_2051.py b/webapp/migrations/0056_auto_20190926_2051.py new file mode 100644 index 0000000..3c9dbff --- /dev/null +++ b/webapp/migrations/0056_auto_20190926_2051.py @@ -0,0 +1,58 @@ +# Generated by Django 2.1.5 on 2019-09-26 17:51 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import phonenumber_field.modelfields + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('webapp', '0055_auto_20190926_2048'), + ] + + operations = [ + migrations.CreateModel( + name='Occupation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start_date', models.DateField(verbose_name='Start date')), + ('end_date', models.DateField(verbose_name='End date')), + ], + options={ + 'verbose_name': 'Occupation', + 'verbose_name_plural': 'Occupations', + }, + ), + migrations.CreateModel( + name='Official', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=30, verbose_name='First name')), + ('last_name', models.CharField(max_length=150, verbose_name='Last name')), + ('email', models.EmailField(max_length=254, verbose_name='Email address')), + ('phone_number', phonenumber_field.modelfields.PhoneNumberField(max_length=128, verbose_name='Phone number')), + ('role_history', models.ManyToManyField(blank=True, to='webapp.Occupation')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Official', + 'verbose_name_plural': 'Officials', + }, + ), + migrations.RemoveField( + model_name='role', + name='end_date', + ), + migrations.RemoveField( + model_name='role', + name='start_date', + ), + migrations.AddField( + model_name='occupation', + name='role', + field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='webapp.Role'), + ), + ] diff --git a/webapp/migrations/0057_auto_20190926_1915.py b/webapp/migrations/0057_auto_20190926_1915.py deleted file mode 100644 index ae2c01f..0000000 --- a/webapp/migrations/0057_auto_20190926_1915.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-26 16:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('webapp', '0056_auto_20190926_1857'), - ] - - operations = [ - migrations.AlterField( - model_name='official', - name='role_history', - field=models.ManyToManyField(blank=True, to='webapp.Occupation'), - ), - ] diff --git a/webapp/migrations/0058_auto_20190926_2010.py b/webapp/migrations/0058_auto_20190926_2010.py deleted file mode 100644 index e7230cd..0000000 --- a/webapp/migrations/0058_auto_20190926_2010.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-26 17:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('webapp', '0057_auto_20190926_1915'), - ] - - operations = [ - migrations.AddField( - model_name='official', - name='email', - field=models.EmailField(default='asd@asd.fi', max_length=254, verbose_name='Email address'), - preserve_default=False, - ), - migrations.AddField( - model_name='official', - name='first_name', - field=models.CharField(default='asd', max_length=30, verbose_name='First name'), - preserve_default=False, - ), - migrations.AddField( - model_name='official', - name='last_name', - field=models.CharField(default='asd', max_length=150, verbose_name='Last name'), - preserve_default=False, - ), - ] diff --git a/webapp/migrations/0059_auto_20190926_2032.py b/webapp/migrations/0059_auto_20190926_2032.py deleted file mode 100644 index a956773..0000000 --- a/webapp/migrations/0059_auto_20190926_2032.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-26 17:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('webapp', '0058_auto_20190926_2010'), - ] - - operations = [ - migrations.RemoveField( - model_name='occupation', - name='occupation', - ), - migrations.AddField( - model_name='occupation', - name='role', - field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='webapp.Role'), - ), - ]