Fixed #140 and possibly #141: cleaned migration mess

agateblue · Jun 15, 2018 · adcc1b6 · adcc1b6
1 parent 6dd9215
commit adcc1b6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 73 deletions.
diff --git a/dynamic_preferences/migrations/0001_initial.py b/dynamic_preferences/migrations/0001_initial.py
@@ -26,28 +26,6 @@ class Migration(migrations.Migration):
             },
             bases=(models.Model,),
         ),
-        migrations.CreateModel(
-            name='UserPreferenceModel',
-            fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
-                ('section', models.CharField(blank=True, default=None, null=True, max_length=150, db_index=True)),
-                ('name', models.CharField(max_length=150, db_index=True)),
-                ('raw_value', models.TextField(blank=True, null=True)),
-                ('instance', models.ForeignKey(to=settings.AUTH_USER_MODEL, 
-                                               on_delete=models.CASCADE, 
-                                               related_name='preferences')),
-            ],
-            options={
-                'verbose_name_plural': 'user preferences',
-                'abstract': False,
-                'verbose_name': 'user preference',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.AlterUniqueTogether(
-            name='userpreferencemodel',
-            unique_together=set([('instance', 'section', 'name')]),
-        ),
         migrations.AlterUniqueTogether(
             name='globalpreferencemodel',
             unique_together=set([('section', 'name')]),

diff --git a/dynamic_preferences/migrations/0002_auto_20150712_0332.py b/dynamic_preferences/migrations/0002_auto_20150712_0332.py
@@ -22,19 +22,4 @@ class Migration(migrations.Migration):
             name='section',
             field=models.CharField(max_length=150, blank=True, db_index=True, default=None, null=True),
         ),
-        migrations.AlterField(
-            model_name='userpreferencemodel',
-            name='instance',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
-        ),
-        migrations.AlterField(
-            model_name='userpreferencemodel',
-            name='name',
-            field=models.CharField(max_length=150, db_index=True),
-        ),
-        migrations.AlterField(
-            model_name='userpreferencemodel',
-            name='section',
-            field=models.CharField(max_length=150, blank=True, db_index=True, default=None, null=True),
-        ),
     ]
diff --git a/dynamic_preferences/migrations/0003_auto_20151223_1407.py b/dynamic_preferences/migrations/0003_auto_20151223_1407.py
@@ -23,16 +23,4 @@ class Migration(migrations.Migration):
             field=models.CharField(max_length=150, null=True, default=None, db_index=True, blank=True),
             preserve_default=True,
         ),
-        migrations.AlterField(
-            model_name='userpreferencemodel',
-            name='name',
-            field=models.CharField(max_length=150, db_index=True),
-            preserve_default=True,
-        ),
-        migrations.AlterField(
-            model_name='userpreferencemodel',
-            name='section',
-            field=models.CharField(max_length=150, null=True, default=None, db_index=True, blank=True),
-            preserve_default=True,
-        ),
     ]
diff --git a/dynamic_preferences/migrations/0004_move_user_model.py b/dynamic_preferences/migrations/0004_move_user_model.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+from django.conf import settings
 
 
 class Migration(migrations.Migration):
@@ -13,17 +14,5 @@ class Migration(migrations.Migration):
         ('dynamic_preferences', '0003_auto_20151223_1407'),
     ]
 
-    database_operations = [
-        migrations.AlterModelTable(
-            'UserPreferenceModel', 'dynamic_preferences_users_userpreferencemodel')
-    ]
-
-    state_operations = [
-        migrations.DeleteModel('UserPreferenceModel')
-    ]
-
-    operations = [
-        migrations.SeparateDatabaseAndState(
-            database_operations=database_operations,
-            state_operations=state_operations)
-    ]
+    # cf https://github.com/EliotBerriot/django-dynamic-preferences/pull/142
+    operations = []
diff --git a/dynamic_preferences/users/migrations/0001_initial.py b/dynamic_preferences/users/migrations/0001_initial.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2017-02-21 06:59
-from __future__ import unicode_literals
+# Generated by Django 2.0.6 on 2018-06-15 16:20
 
 from django.conf import settings
 from django.db import migrations, models
@@ -12,11 +10,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('dynamic_preferences', '0004_move_user_model'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
-    state_operations = [
+    operations = [
         migrations.CreateModel(
             name='UserPreferenceModel',
             fields=[
@@ -34,10 +31,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='userpreferencemodel',
-            unique_together=set([('instance', 'section', 'name')]),
+            unique_together={('instance', 'section', 'name')},
         ),
     ]
-
-    operations = [
-        migrations.SeparateDatabaseAndState(state_operations=state_operations)
-    ]