From ad52fb14f0e9e95e6cf2c008608557735c01ad74 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sun, 11 Jan 2015 17:05:38 +0100 Subject: [PATCH] Reset migrations --- dpdapi/migrations/0001_initial.py | 10 +++--- dpdapi/migrations/0002_auto_20150107_0309.py | 30 ------------------ dpdapi/migrations/0003_auto_20150107_1226.py | 32 -------------------- dpdapi/models.py | 2 +- 4 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 dpdapi/migrations/0002_auto_20150107_0309.py delete mode 100644 dpdapi/migrations/0003_auto_20150107_1226.py diff --git a/dpdapi/migrations/0001_initial.py b/dpdapi/migrations/0001_initial.py index e533c37..83d93ed 100644 --- a/dpdapi/migrations/0001_initial.py +++ b/dpdapi/migrations/0001_initial.py @@ -16,12 +16,12 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('source', models.EmailField(max_length=75)), - ('destination', models.EmailField(max_length=75)), + ('source', models.EmailField(max_length=254)), + ('destination', models.EmailField(max_length=254)), ('active', models.BooleanField(default=True)), ], options={ - 'abstract': False, + 'verbose_name_plural': 'aliases', }, bases=(models.Model,), ), @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('name', models.CharField(max_length=1000)), + ('name', models.CharField(unique=True, max_length=254)), ], options={ 'abstract': False, @@ -44,7 +44,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('email', models.EmailField(max_length=75)), + ('email', models.EmailField(unique=True, max_length=254)), ('password', models.CharField(max_length=109)), ('domain', models.ForeignKey(to='dpdapi.Domain')), ], diff --git a/dpdapi/migrations/0002_auto_20150107_0309.py b/dpdapi/migrations/0002_auto_20150107_0309.py deleted file mode 100644 index c4d3ce4..0000000 --- a/dpdapi/migrations/0002_auto_20150107_0309.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('dpdapi', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='alias', - options={'verbose_name_plural': 'aliases'}, - ), - migrations.AlterField( - model_name='domain', - name='name', - field=models.CharField(unique=True, max_length=1000), - preserve_default=True, - ), - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(unique=True, max_length=75), - preserve_default=True, - ), - ] diff --git a/dpdapi/migrations/0003_auto_20150107_1226.py b/dpdapi/migrations/0003_auto_20150107_1226.py deleted file mode 100644 index 713d16c..0000000 --- a/dpdapi/migrations/0003_auto_20150107_1226.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('dpdapi', '0002_auto_20150107_0309'), - ] - - operations = [ - migrations.AlterField( - model_name='alias', - name='destination', - field=models.EmailField(max_length=254), - preserve_default=True, - ), - migrations.AlterField( - model_name='alias', - name='source', - field=models.EmailField(max_length=254), - preserve_default=True, - ), - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(unique=True, max_length=254), - preserve_default=True, - ), - ] diff --git a/dpdapi/models.py b/dpdapi/models.py index 8950e61..1410aa3 100644 --- a/dpdapi/models.py +++ b/dpdapi/models.py @@ -24,7 +24,7 @@ class Alias(BaseModel): class Domain(BaseModel): - name = models.CharField(max_length=1000, unique=True) + name = models.CharField(max_length=254, unique=True) def __unicode__(self): return self.name