From 7f105e4a69714b0e4100fa263566c0d04b5c68a7 Mon Sep 17 00:00:00 2001 From: virusdefender Date: Mon, 6 Feb 2017 17:19:53 +0800 Subject: [PATCH] rebuild some strange migration --- contest/migrations/0001_initial.py | 23 ++++-- .../0002_contestannouncement_created_by.py | 24 ------ contest/migrations/0003_auto_20170202_0826.py | 82 ------------------- problem/migrations/0001_initial.py | 35 ++++---- problem/migrations/0002_auto_20170202_0826.py | 73 ----------------- problem/migrations/0003_problem_template.py | 22 ----- 6 files changed, 30 insertions(+), 229 deletions(-) delete mode 100644 contest/migrations/0002_contestannouncement_created_by.py delete mode 100644 contest/migrations/0003_auto_20170202_0826.py delete mode 100644 problem/migrations/0002_auto_20170202_0826.py delete mode 100644 problem/migrations/0003_problem_template.py diff --git a/contest/migrations/0001_initial.py b/contest/migrations/0001_initial.py index 6bc91a9..255b8d0 100644 --- a/contest/migrations/0001_initial.py +++ b/contest/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-01-26 04:32 +# Generated by Django 1.9.12 on 2017-02-06 09:19 from __future__ import unicode_literals from django.conf import settings @@ -14,6 +14,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('problem', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -59,6 +60,7 @@ class Migration(migrations.Migration): ('content', utils.models.RichTextField()), ('create_time', models.DateTimeField(auto_now_add=True)), ('contest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contest.Contest')), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ 'db_table': 'contest_announcement', @@ -68,28 +70,35 @@ class Migration(migrations.Migration): name='ContestProblem', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=50)), + ('title', models.CharField(max_length=128)), ('description', utils.models.RichTextField()), - ('input_description', models.CharField(max_length=10000)), - ('output_description', models.CharField(max_length=10000)), - ('samples', models.TextField(blank=True)), - ('test_case_id', models.CharField(max_length=40)), + ('input_description', utils.models.RichTextField()), + ('output_description', utils.models.RichTextField()), + ('samples', jsonfield.fields.JSONField()), + ('test_case_id', models.CharField(max_length=32)), + ('test_case_score', jsonfield.fields.JSONField()), ('hint', utils.models.RichTextField(blank=True, null=True)), + ('languages', jsonfield.fields.JSONField()), + ('template', jsonfield.fields.JSONField()), ('create_time', models.DateTimeField(auto_now_add=True)), ('last_update_time', models.DateTimeField(blank=True, null=True)), ('time_limit', models.IntegerField()), ('memory_limit', models.IntegerField()), ('spj', models.BooleanField(default=False)), - ('spj_language', models.IntegerField(blank=True, null=True)), + ('spj_language', models.CharField(blank=True, max_length=32, null=True)), ('spj_code', models.TextField(blank=True, null=True)), ('spj_version', models.CharField(blank=True, max_length=32, null=True)), + ('rule_type', models.CharField(max_length=32)), ('visible', models.BooleanField(default=True)), + ('difficulty', models.CharField(max_length=32)), + ('source', models.CharField(blank=True, max_length=200, null=True)), ('total_submit_number', models.IntegerField(default=0)), ('total_accepted_number', models.IntegerField(default=0)), ('sort_index', models.CharField(max_length=30)), ('is_public', models.BooleanField(default=False)), ('contest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contest.Contest')), ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('tags', models.ManyToManyField(to='problem.ProblemTag')), ], options={ 'db_table': 'contest_problem', diff --git a/contest/migrations/0002_contestannouncement_created_by.py b/contest/migrations/0002_contestannouncement_created_by.py deleted file mode 100644 index be52309..0000000 --- a/contest/migrations/0002_contestannouncement_created_by.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-01-29 08:56 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('contest', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='contestannouncement', - name='created_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - ] diff --git a/contest/migrations/0003_auto_20170202_0826.py b/contest/migrations/0003_auto_20170202_0826.py deleted file mode 100644 index 554b005..0000000 --- a/contest/migrations/0003_auto_20170202_0826.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-02-02 08:26 -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields -import utils.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('problem', '0002_auto_20170202_0826'), - ('contest', '0002_contestannouncement_created_by'), - ] - - operations = [ - migrations.AddField( - model_name='contestproblem', - name='difficulty', - field=models.CharField(default='LOW', max_length=32), - preserve_default=False, - ), - migrations.AddField( - model_name='contestproblem', - name='languages', - field=jsonfield.fields.JSONField(default=[]), - preserve_default=False, - ), - migrations.AddField( - model_name='contestproblem', - name='rule_type', - field=models.CharField(default='ACM', max_length=32), - preserve_default=False, - ), - migrations.AddField( - model_name='contestproblem', - name='source', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AddField( - model_name='contestproblem', - name='tags', - field=models.ManyToManyField(to='problem.ProblemTag'), - ), - migrations.AddField( - model_name='contestproblem', - name='test_case_score', - field=jsonfield.fields.JSONField(default={}), - preserve_default=False, - ), - migrations.AlterField( - model_name='contestproblem', - name='input_description', - field=utils.models.RichTextField(), - ), - migrations.AlterField( - model_name='contestproblem', - name='output_description', - field=utils.models.RichTextField(), - ), - migrations.AlterField( - model_name='contestproblem', - name='samples', - field=jsonfield.fields.JSONField(), - ), - migrations.AlterField( - model_name='contestproblem', - name='spj_language', - field=models.CharField(blank=True, max_length=32, null=True), - ), - migrations.AlterField( - model_name='contestproblem', - name='test_case_id', - field=models.CharField(max_length=32), - ), - migrations.AlterField( - model_name='contestproblem', - name='title', - field=models.CharField(max_length=128), - ), - ] diff --git a/problem/migrations/0001_initial.py b/problem/migrations/0001_initial.py index 87dcb4f..bdcf2ee 100644 --- a/problem/migrations/0001_initial.py +++ b/problem/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-01-31 09:35 +# Generated by Django 1.9.12 on 2017-02-06 09:19 from __future__ import unicode_literals from django.conf import settings @@ -22,31 +22,35 @@ class Migration(migrations.Migration): name='Problem', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=50)), + ('title', models.CharField(max_length=128)), ('description', utils.models.RichTextField()), - ('input_description', models.CharField(max_length=10000)), - ('output_description', models.CharField(max_length=10000)), - ('samples', models.TextField(blank=True)), - ('test_case_id', models.CharField(max_length=40)), + ('input_description', utils.models.RichTextField()), + ('output_description', utils.models.RichTextField()), + ('samples', jsonfield.fields.JSONField()), + ('test_case_id', models.CharField(max_length=32)), + ('test_case_score', jsonfield.fields.JSONField()), ('hint', utils.models.RichTextField(blank=True, null=True)), + ('languages', jsonfield.fields.JSONField()), + ('template', jsonfield.fields.JSONField()), ('create_time', models.DateTimeField(auto_now_add=True)), ('last_update_time', models.DateTimeField(blank=True, null=True)), ('time_limit', models.IntegerField()), ('memory_limit', models.IntegerField()), ('spj', models.BooleanField(default=False)), - ('spj_language', models.IntegerField(blank=True, null=True)), + ('spj_language', models.CharField(blank=True, max_length=32, null=True)), ('spj_code', models.TextField(blank=True, null=True)), ('spj_version', models.CharField(blank=True, max_length=32, null=True)), + ('rule_type', models.CharField(max_length=32)), ('visible', models.BooleanField(default=True)), + ('difficulty', models.CharField(max_length=32)), + ('source', models.CharField(blank=True, max_length=200, null=True)), ('total_submit_number', models.IntegerField(default=0)), ('total_accepted_number', models.IntegerField(default=0)), - ('difficulty', models.IntegerField()), - ('source', models.CharField(blank=True, max_length=200, null=True)), ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ - 'abstract': False, 'db_table': 'problem', + 'abstract': False, }, ), migrations.CreateModel( @@ -59,17 +63,6 @@ class Migration(migrations.Migration): 'db_table': 'problem_tag', }, ), - migrations.CreateModel( - name='TestCaseScore', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('test_case_id', models.CharField(max_length=32)), - ('score', jsonfield.fields.JSONField()), - ], - options={ - 'db_table': 'test_case_score', - }, - ), migrations.AddField( model_name='problem', name='tags', diff --git a/problem/migrations/0002_auto_20170202_0826.py b/problem/migrations/0002_auto_20170202_0826.py deleted file mode 100644 index 9b56810..0000000 --- a/problem/migrations/0002_auto_20170202_0826.py +++ /dev/null @@ -1,73 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-02-02 08:26 -from __future__ import unicode_literals - -from django.db import migrations, models -import jsonfield.fields -import utils.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('problem', '0001_initial'), - ] - - operations = [ - migrations.DeleteModel( - name='TestCaseScore', - ), - migrations.AddField( - model_name='problem', - name='languages', - field=jsonfield.fields.JSONField(default=[]), - preserve_default=False, - ), - migrations.AddField( - model_name='problem', - name='rule_type', - field=models.CharField(default='ACM', max_length=32), - preserve_default=False, - ), - migrations.AddField( - model_name='problem', - name='test_case_score', - field=jsonfield.fields.JSONField(default={}), - preserve_default=False, - ), - migrations.AlterField( - model_name='problem', - name='difficulty', - field=models.CharField(max_length=32), - ), - migrations.AlterField( - model_name='problem', - name='input_description', - field=utils.models.RichTextField(), - ), - migrations.AlterField( - model_name='problem', - name='output_description', - field=utils.models.RichTextField(), - ), - migrations.AlterField( - model_name='problem', - name='samples', - field=jsonfield.fields.JSONField(), - ), - migrations.AlterField( - model_name='problem', - name='spj_language', - field=models.CharField(blank=True, max_length=32, null=True), - ), - migrations.AlterField( - model_name='problem', - name='test_case_id', - field=models.CharField(max_length=32), - ), - migrations.AlterField( - model_name='problem', - name='title', - field=models.CharField(max_length=128), - ), - ] diff --git a/problem/migrations/0003_problem_template.py b/problem/migrations/0003_problem_template.py deleted file mode 100644 index 3e1035a..0000000 --- a/problem/migrations/0003_problem_template.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.12 on 2017-02-05 08:02 -from __future__ import unicode_literals - -from django.db import migrations -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('problem', '0002_auto_20170202_0826'), - ] - - operations = [ - migrations.AddField( - model_name='problem', - name='template', - field=jsonfield.fields.JSONField(default={}), - preserve_default=False, - ), - ]