From 6748241905587d78bfb058ea52d0b770fb990eae Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 22 Nov 2018 13:12:07 +0100 Subject: [PATCH] *: redo migrations again --- passbook/core/migrations/0001_initial.py | 75 ++++++++++--------- .../oauth_client/migrations/0001_initial.py | 4 +- .../oauth_provider/migrations/0001_initial.py | 4 +- passbook/saml_idp/migrations/0001_initial.py | 4 +- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/passbook/core/migrations/0001_initial.py b/passbook/core/migrations/0001_initial.py index b1963137b..a68ba7f9b 100644 --- a/passbook/core/migrations/0001_initial.py +++ b/passbook/core/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-16 10:21 +# Generated by Django 2.1.3 on 2018-11-22 10:03 import uuid @@ -33,6 +33,8 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ 'verbose_name': 'user', @@ -43,20 +45,6 @@ class Migration(migrations.Migration): ('objects', django.contrib.auth.models.UserManager()), ], ), - migrations.CreateModel( - name='Application', - fields=[ - ('created', models.DateField(auto_now_add=True)), - ('last_updated', models.DateTimeField(auto_now=True)), - ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), - ('name', models.TextField()), - ('launch_url', models.URLField(blank=True, null=True)), - ('icon_url', models.TextField(blank=True, null=True)), - ], - options={ - 'abstract': False, - }, - ), migrations.CreateModel( name='Provider', fields=[ @@ -78,14 +66,11 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='Source', + name='RuleModel', fields=[ ('created', models.DateField(auto_now_add=True)), ('last_updated', models.DateTimeField(auto_now=True)), ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), - ('name', models.TextField()), - ('slug', models.SlugField()), - ('enabled', models.BooleanField(default=True)), ], options={ 'abstract': False, @@ -97,10 +82,23 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateField(auto_now_add=True)), ('last_updated', models.DateTimeField(auto_now=True)), - ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passbook_core.Source')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='Application', + fields=[ + ('rulemodel_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='passbook_core.RuleModel')), + ('name', models.TextField()), + ('launch_url', models.URLField(blank=True, null=True)), + ('icon_url', models.TextField(blank=True, null=True)), + ('provider', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='passbook_core.Provider')), + ], + options={ + 'abstract': False, + }, + bases=('passbook_core.rulemodel',), + ), migrations.CreateModel( name='FieldMatcherRule', fields=[ @@ -114,36 +112,39 @@ class Migration(migrations.Migration): }, bases=('passbook_core.rule',), ), - migrations.AddField( - model_name='rule', - name='application', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passbook_core.Application'), + migrations.CreateModel( + name='Source', + fields=[ + ('rulemodel_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='passbook_core.RuleModel')), + ('name', models.TextField()), + ('slug', models.SlugField()), + ('enabled', models.BooleanField(default=True)), + ], + options={ + 'abstract': False, + }, + bases=('passbook_core.rulemodel',), ), migrations.AddField( - model_name='application', - name='provider', - field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='passbook_core.Provider'), + model_name='rulemodel', + name='rules', + field=models.ManyToManyField(to='passbook_core.Rule'), + ), + migrations.AddField( + model_name='usersourceconnection', + name='source', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passbook_core.Source'), ), migrations.AddField( model_name='user', name='applications', field=models.ManyToManyField(to='passbook_core.Application'), ), - migrations.AddField( - model_name='user', - name='groups', - field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'), - ), migrations.AddField( model_name='user', name='sources', field=models.ManyToManyField(through='passbook_core.UserSourceConnection', to='passbook_core.Source'), ), - migrations.AddField( - model_name='user', - name='user_permissions', - field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'), - ), migrations.AlterUniqueTogether( name='usersourceconnection', unique_together={('user', 'source')}, diff --git a/passbook/oauth_client/migrations/0001_initial.py b/passbook/oauth_client/migrations/0001_initial.py index fc0d88950..5e307a4c2 100644 --- a/passbook/oauth_client/migrations/0001_initial.py +++ b/passbook/oauth_client/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-16 10:21 +# Generated by Django 2.1.3 on 2018-11-22 10:03 import django.db.models.deletion from django.db import migrations, models @@ -9,7 +9,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('passbook_core', '__first__'), + ('passbook_core', '0001_initial'), ] operations = [ diff --git a/passbook/oauth_provider/migrations/0001_initial.py b/passbook/oauth_provider/migrations/0001_initial.py index 751ac7762..8b17a1f33 100644 --- a/passbook/oauth_provider/migrations/0001_initial.py +++ b/passbook/oauth_provider/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-16 10:21 +# Generated by Django 2.1.3 on 2018-11-22 10:03 import django.db.models.deletion from django.conf import settings @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('passbook_core', '0001_initial'), migrations.swappable_dependency(settings.OAUTH2_PROVIDER_APPLICATION_MODEL), - ('passbook_core', '__first__'), ] operations = [ diff --git a/passbook/saml_idp/migrations/0001_initial.py b/passbook/saml_idp/migrations/0001_initial.py index 8c2500c0f..e1ac8a9d8 100644 --- a/passbook/saml_idp/migrations/0001_initial.py +++ b/passbook/saml_idp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-16 10:21 +# Generated by Django 2.1.3 on 2018-11-22 10:03 import django.db.models.deletion from django.db import migrations, models @@ -9,7 +9,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('passbook_core', '__first__'), + ('passbook_core', '0001_initial'), ] operations = [