From 2454247f0df5e83ea217f20146b9d6b026179db2 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 23 Mar 2015 16:44:48 +0100 Subject: [PATCH] override default migrations for django.contrib.auth in order to resize the username end email fields (#6633) --- src/authentic2/auth_migrations/0001_initial.py | 66 ++++++++++++++++++++++ .../auth_migrations/0002_auto_20150323_1720.py | 21 +++++++ src/authentic2/auth_migrations/__init__.py | 0 src/authentic2/settings.py | 5 ++ 4 files changed, 92 insertions(+) create mode 100644 src/authentic2/auth_migrations/0001_initial.py create mode 100644 src/authentic2/auth_migrations/0002_auto_20150323_1720.py create mode 100644 src/authentic2/auth_migrations/__init__.py diff --git a/src/authentic2/auth_migrations/0001_initial.py b/src/authentic2/auth_migrations/0001_initial.py new file mode 100644 index 0000000..502326e --- /dev/null +++ b/src/authentic2/auth_migrations/0001_initial.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.core import validators +from django.db import models, migrations +from django.utils import timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '__first__'), + ] + + operations = [ + migrations.CreateModel( + name='Permission', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=50, verbose_name='name')), + ('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id')), + ('codename', models.CharField(max_length=100, verbose_name='codename')), + ], + options={ + 'ordering': ('content_type__app_label', 'content_type__model', 'codename'), + 'unique_together': set([('content_type', 'codename')]), + 'verbose_name': 'permission', + 'verbose_name_plural': 'permissions', + }, + ), + migrations.CreateModel( + name='Group', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(unique=True, max_length=80, verbose_name='name')), + ('permissions', models.ManyToManyField(to='auth.Permission', verbose_name='permissions', blank=True)), + ], + options={ + 'verbose_name': 'group', + 'verbose_name_plural': 'groups', + }, + ), + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(default=timezone.now, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, max_length=30, verbose_name='username', validators=[validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])), + ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)), + ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)), + ('email', models.EmailField(max_length=75, verbose_name='email address', blank=True)), + ('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=timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(to='auth.Group', verbose_name='groups', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', related_name='user_set', related_query_name='user')), + ('user_permissions', models.ManyToManyField(to='auth.Permission', verbose_name='user permissions', blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user')), + ], + options={ + 'swappable': 'AUTH_USER_MODEL', + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + }, + ), + ] diff --git a/src/authentic2/auth_migrations/0002_auto_20150323_1720.py b/src/authentic2/auth_migrations/0002_auto_20150323_1720.py new file mode 100644 index 0000000..9e5439b --- /dev/null +++ b/src/authentic2/auth_migrations/0002_auto_20150323_1720.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import django.core.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='username', + field=models.CharField(help_text='Required, 255 characters or fewer. Only letters, numbers, and @, ., +, -, or _ characters.', unique=True, max_length=255, verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')]), + preserve_default=True, + ), + ] diff --git a/src/authentic2/auth_migrations/__init__.py b/src/authentic2/auth_migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/authentic2/settings.py b/src/authentic2/settings.py index 06c6fc6..1152c9c 100644 --- a/src/authentic2/settings.py +++ b/src/authentic2/settings.py @@ -229,16 +229,21 @@ LOGGING = { 'authentic2_idp_openid': { 'handlers': ['console'], 'level': 'INFO', 'propagate': False, }, }, } +# Temporary fix for User.username field length +MIGRATION_MODULES = { + 'auth': 'authentic2.auth_migrations', +} + # # Load configuration file # if 'AUTHENTIC2_SETTINGS_FILE' in os.environ: execfile(os.environ['AUTHENTIC2_SETTINGS_FILE']) # -- 1.9.1