diff options
| -rw-r--r-- | ishtar_common/migrations/0010_auto_20170829_1655.py | 39 | ||||
| -rw-r--r-- | scripts/migrate_from_v1_to_v2.sql | 3 |
2 files changed, 2 insertions, 40 deletions
diff --git a/ishtar_common/migrations/0010_auto_20170829_1655.py b/ishtar_common/migrations/0010_auto_20170829_1655.py deleted file mode 100644 index ee57865cb..000000000 --- a/ishtar_common/migrations/0010_auto_20170829_1655.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-08-29 16:55 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0009_auto_20170829_1651'), - ] - - operations = [ - migrations.CreateModel( - name='TargetKeyGroup', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField(unique=True, verbose_name='Name')), - ('all_user_can_use', models.BooleanField(default=False, verbose_name='All user can user it')), - ('all_user_can_modify', models.BooleanField(default=False, verbose_name='All user can modify it')), - ('available', models.BooleanField(default=True, verbose_name='Available')), - ], - options={ - 'verbose_name': 'Importer - Target key group', - 'verbose_name_plural': 'Importer - Target key groups', - }, - ), - migrations.AddField( - model_name='targetkey', - name='associated_group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.TargetKeyGroup'), - ), - migrations.AlterUniqueTogether( - name='targetkey', - unique_together=set([('target', 'key', 'associated_user', 'associated_import', 'associated_group')]), - ), - ] diff --git a/scripts/migrate_from_v1_to_v2.sql b/scripts/migrate_from_v1_to_v2.sql index 8f68d469b..7d40e5c54 100644 --- a/scripts/migrate_from_v1_to_v2.sql +++ b/scripts/migrate_from_v1_to_v2.sql @@ -1 +1,2 @@ -alter table auth_user alter last_login drop not null; +ALTER TABLE auth_user ALTER last_login DROP NOT NULL; +ALTER TABLE django_content_type DROP COLUMN name; |