migrations: recreate squashed migrations from scratch (fixes #23134)

This commit is contained in:
Benjamin Dauvergne 2018-04-12 15:57:08 +02:00
parent 933d611db1
commit d7360895c7
2 changed files with 54 additions and 187 deletions

View File

@ -24,24 +24,38 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Document',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('document_filename', models.CharField(max_length=512, verbose_name='document filename')),
('document_file', models.FileField(upload_to=b'', verbose_name='file')),
('creation', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')),
('content_hash', models.CharField(max_length=128, serialize=False, verbose_name='content hash', primary_key=True)),
('content', models.FileField(upload_to=b'uploads/', max_length=300, verbose_name='file')),
('mime_type', models.CharField(max_length=256, blank=True)),
('creation_date', models.DateTimeField(auto_now_add=True)),
],
options={
'ordering': ('-creation',),
'ordering': ('creation_date',),
'verbose_name': 'document',
'verbose_name_plural': 'documents',
},
),
migrations.CreateModel(
name='Origin',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('label', models.CharField(max_length=80, verbose_name='Label')),
('slug', models.SlugField(verbose_name='Slug')),
],
),
migrations.CreateModel(
name='UserDocument',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('filename', models.CharField(max_length=512, verbose_name='filename')),
('created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
('deletable_by_user', models.BooleanField(default=True, verbose_name='deletable by user')),
('title', models.CharField(max_length=200, verbose_name='title', blank=True)),
('description', models.TextField(verbose_name='description', blank=True)),
('expiration_date', models.DateField(null=True, verbose_name='expiration date', blank=True)),
('document', models.ForeignKey(related_name='user_documents', verbose_name='document', to='fargo.Document')),
('origin', models.ForeignKey(verbose_name='origin', to='fargo.Origin', null=True)),
('user', models.ForeignKey(related_name='user_documents', verbose_name='user', to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ('-created', 'user'),
@ -52,146 +66,16 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Validation',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('content_hash', models.CharField(max_length=128, null=True, verbose_name='content hash', blank=True)),
('document_type', models.CharField(max_length=256, verbose_name='document type')),
('data', jsonfield.fields.JSONField(null=True, verbose_name='data')),
('start', models.DateField(verbose_name='start date')),
('end', models.DateField(verbose_name='end date')),
('creator', models.CharField(max_length=256, verbose_name='creator')),
('created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
('user_document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fargo.UserDocument', verbose_name='user document')),
('created', models.DateTimeField(verbose_name='creation date')),
('origin', models.ForeignKey(verbose_name='origin', to='fargo.Origin', null=True)),
('user', models.ForeignKey(verbose_name='user', to=settings.AUTH_USER_MODEL)),
],
),
migrations.AlterModelOptions(
name='document',
options={'ordering': ('content_hash',), 'verbose_name': 'document', 'verbose_name_plural': 'documents'},
),
migrations.RenameField(
model_name='document',
old_name='document_file',
new_name='content',
),
migrations.RemoveField(
model_name='document',
name='creation',
),
migrations.RemoveField(
model_name='document',
name='document_filename',
),
migrations.RemoveField(
model_name='document',
name='id',
),
migrations.RemoveField(
model_name='document',
name='user',
),
migrations.AddField(
model_name='document',
name='content_hash',
field=models.CharField(default=datetime.datetime(2015, 9, 24, 10, 56, 54, 873399, tzinfo=utc), max_length=128, primary_key=True, serialize=False, verbose_name='content hash'),
preserve_default=False,
),
migrations.AddField(
model_name='userdocument',
name='document',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_documents', to='fargo.Document', verbose_name='document'),
),
migrations.AddField(
model_name='userdocument',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'),
),
migrations.CreateModel(
name='Origin',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('label', models.CharField(max_length=80, verbose_name='Label')),
('slug', models.SlugField(verbose_name='Slug')),
],
),
migrations.AddField(
model_name='userdocument',
name='origin',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='fargo.Origin', verbose_name='origin'),
),
migrations.AddField(
model_name='validation',
name='content_hash',
field=models.CharField(blank=True, max_length=128, null=True, verbose_name='content hash'),
),
migrations.AddField(
model_name='validation',
name='user',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'),
),
migrations.RemoveField(
model_name='validation',
name='user_document',
),
migrations.AlterField(
model_name='validation',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'),
),
migrations.AddField(
model_name='validation',
name='origin',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='fargo.Origin', verbose_name='origin'),
),
migrations.AlterField(
model_name='document',
name='content',
field=models.FileField(upload_to=b'uploads/', verbose_name='file'),
),
migrations.AlterField(
model_name='userdocument',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_documents', to=settings.AUTH_USER_MODEL, verbose_name='user'),
),
migrations.AlterField(
model_name='validation',
name='created',
field=models.DateTimeField(verbose_name='creation date'),
),
migrations.AddField(
model_name='userdocument',
name='deletable_by_user',
field=models.BooleanField(default=True, verbose_name='deletable by user'),
),
migrations.AlterField(
model_name='document',
name='content',
field=models.FileField(max_length=300, upload_to=b'uploads/', verbose_name='file'),
),
migrations.AddField(
model_name='document',
name='mime_type',
field=models.CharField(blank=True, max_length=256),
),
migrations.AddField(
model_name='userdocument',
name='description',
field=models.TextField(blank=True, verbose_name='description'),
),
migrations.AddField(
model_name='userdocument',
name='expiration_date',
field=models.DateField(blank=True, null=True, verbose_name='expiration date'),
),
migrations.AddField(
model_name='userdocument',
name='title',
field=models.CharField(blank=True, max_length=200, verbose_name='title'),
),
migrations.AddField(
model_name='document',
name='creation_date',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterModelOptions(
name='document',
options={'ordering': ('creation_date',), 'verbose_name': 'document', 'verbose_name_plural': 'documents'},
),
]

View File

@ -21,72 +21,55 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='OAuth2Authorize',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('access_token', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
('code', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
('creation_date', models.DateTimeField(auto_now=True)),
('user_document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fargo.UserDocument')),
('creation_date', models.DateTimeField(auto_now_add=True)),
],
options={
'ordering': ('creation_date',),
'verbose_name': 'OAUTH2 authorization',
'verbose_name_plural': 'OAUTH2 authorizations',
},
),
migrations.CreateModel(
name='OAuth2Client',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('client_secret', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
('client_id', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('client_name', models.CharField(max_length=255)),
('redirect_uris', models.TextField(validators=[fargo.oauth2.models.validate_https_url], verbose_name='redirect URIs')),
('redirect_uris', models.TextField(verbose_name='redirect URIs', validators=[fargo.oauth2.models.validate_https_url])),
('client_id', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
('client_secret', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=255)),
],
options={
'ordering': ('client_name',),
'verbose_name': 'OAUTH2 client',
'verbose_name_plural': 'OAUTH2 clients',
},
),
migrations.CreateModel(
name='OAuth2TempFile',
fields=[
('hash_key', models.CharField(max_length=128, primary_key=True, serialize=False)),
('uuid', models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=32, serialize=False, primary_key=True)),
('filename', models.CharField(max_length=512)),
('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oauth2_tempfiles', to='fargo.Document')),
('creation_date', models.DateTimeField(auto_now_add=True)),
('client', models.ForeignKey(to='oauth2.OAuth2Client')),
('document', models.ForeignKey(related_name='oauth2_tempfiles', to='fargo.Document')),
],
options={
'ordering': ('creation_date',),
'verbose_name': 'OAUTH2 temporary file',
'verbose_name_plural': 'OAUTH2 temporary files',
},
),
migrations.AddField(
model_name='oauth2authorize',
name='client',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='oauth2.OAuth2Client'),
preserve_default=False,
field=models.ForeignKey(to='oauth2.OAuth2Client'),
),
migrations.AddField(
model_name='oauth2tempfile',
name='client',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='oauth2.OAuth2Client'),
preserve_default=False,
),
migrations.RemoveField(
model_name='oauth2tempfile',
name='hash_key',
),
migrations.AddField(
model_name='oauth2tempfile',
name='creation_date',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AddField(
model_name='oauth2tempfile',
name='uuid',
field=models.CharField(default=fargo.oauth2.models.generate_uuid, max_length=32, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='oauth2authorize',
name='creation_date',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterModelOptions(
name='oauth2authorize',
options={'ordering': ('creation_date',), 'verbose_name': 'OAUTH2 authorization', 'verbose_name_plural': 'OAUTH2 authorizations'},
),
migrations.AlterModelOptions(
name='oauth2client',
options={'ordering': ('client_name',), 'verbose_name': 'OAUTH2 client', 'verbose_name_plural': 'OAUTH2 clients'},
),
migrations.AlterModelOptions(
name='oauth2tempfile',
options={'ordering': ('creation_date',), 'verbose_name': 'OAUTH2 temporary file', 'verbose_name_plural': 'OAUTH2 temporary files'},
name='user_document',
field=models.ForeignKey(to='fargo.UserDocument'),
),
]