From 8e026d771107ea317ca0de2002c2ccfb5db01d1e Mon Sep 17 00:00:00 2001 From: zema1 Date: Tue, 31 Oct 2017 20:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=83=A8=E5=88=86migrations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0003_userprofile_total_score.py | 4 +++ .../0004_remove_userprofile_time_zone.py | 19 ------------ account/migrations/0005_auto_20170830_1154.py | 2 +- account/migrations/0006_user_session_keys.py | 17 ++++++++++- account/migrations/0007_auto_20170920_0254.py | 30 ------------------- account/migrations/0008_auto_20171011_1214.py | 2 +- .../migrations/0002_auto_20171011_1214.py | 4 +++ contest/migrations/0006_auto_20171011_1214.py | 4 +++ oj/settings.py | 4 +-- .../migrations/0002_auto_20170509_1203.py | 18 +++++++++++ .../migrations/0003_auto_20170704_1243.py | 24 --------------- .../migrations/0004_auto_20170717_1324.py | 24 --------------- .../migrations/0005_submission_username.py | 2 +- .../migrations/0007_auto_20170923_1318.py | 11 +++++++ .../migrations/0008_auto_20171011_1214.py | 26 ---------------- 15 files changed, 62 insertions(+), 129 deletions(-) delete mode 100644 account/migrations/0004_remove_userprofile_time_zone.py delete mode 100644 account/migrations/0007_auto_20170920_0254.py delete mode 100644 submission/migrations/0003_auto_20170704_1243.py delete mode 100644 submission/migrations/0004_auto_20170717_1324.py delete mode 100644 submission/migrations/0008_auto_20171011_1214.py diff --git a/account/migrations/0003_userprofile_total_score.py b/account/migrations/0003_userprofile_total_score.py index f836b916..f7efe883 100644 --- a/account/migrations/0003_userprofile_total_score.py +++ b/account/migrations/0003_userprofile_total_score.py @@ -22,4 +22,8 @@ class Migration(migrations.Migration): old_name='accepted_problem_number', new_name='accepted_number', ), + migrations.RemoveField( + model_name='userprofile', + name='time_zone', + ) ] diff --git a/account/migrations/0004_remove_userprofile_time_zone.py b/account/migrations/0004_remove_userprofile_time_zone.py deleted file mode 100644 index 97345a40..00000000 --- a/account/migrations/0004_remove_userprofile_time_zone.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2017-08-23 09:04 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('account', '0003_userprofile_total_score'), - ] - - operations = [ - migrations.RemoveField( - model_name='userprofile', - name='time_zone', - ), - ] diff --git a/account/migrations/0005_auto_20170830_1154.py b/account/migrations/0005_auto_20170830_1154.py index efc739d6..1ba8a947 100644 --- a/account/migrations/0005_auto_20170830_1154.py +++ b/account/migrations/0005_auto_20170830_1154.py @@ -9,7 +9,7 @@ import jsonfield.fields class Migration(migrations.Migration): dependencies = [ - ('account', '0004_remove_userprofile_time_zone'), + ('account', '0003_userprofile_total_score'), ] operations = [ diff --git a/account/migrations/0006_user_session_keys.py b/account/migrations/0006_user_session_keys.py index 4a0282a6..6dc991a2 100644 --- a/account/migrations/0006_user_session_keys.py +++ b/account/migrations/0006_user_session_keys.py @@ -2,7 +2,7 @@ # Generated by Django 1.11.4 on 2017-09-16 06:22 from __future__ import unicode_literals -from django.db import migrations +from django.db import migrations, models import jsonfield.fields @@ -18,4 +18,19 @@ class Migration(migrations.Migration): name='session_keys', field=jsonfield.fields.JSONField(default=[]), ), + migrations.RenameField( + model_name='userprofile', + old_name='phone_number', + new_name='github', + ), + migrations.AlterField( + model_name='userprofile', + name='avatar', + field=models.CharField(default='/static/avatar/default.png', max_length=50), + ), + migrations.AlterField( + model_name='userprofile', + name='github', + field=models.CharField(blank=True, max_length=50, null=True), + ), ] diff --git a/account/migrations/0007_auto_20170920_0254.py b/account/migrations/0007_auto_20170920_0254.py deleted file mode 100644 index 896d0d89..00000000 --- a/account/migrations/0007_auto_20170920_0254.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-09-20 02:54 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('account', '0006_user_session_keys'), - ] - - operations = [ - migrations.RenameField( - model_name='userprofile', - old_name='phone_number', - new_name='github', - ), - migrations.AlterField( - model_name='userprofile', - name='avatar', - field=models.CharField(default='/static/avatar/default.png', max_length=50), - ), - migrations.AlterField( - model_name='userprofile', - name='github', - field=models.CharField(blank=True, max_length=50, null=True), - ), - ] diff --git a/account/migrations/0008_auto_20171011_1214.py b/account/migrations/0008_auto_20171011_1214.py index 7426a1f1..f27cac8e 100644 --- a/account/migrations/0008_auto_20171011_1214.py +++ b/account/migrations/0008_auto_20171011_1214.py @@ -9,7 +9,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('account', '0007_auto_20170920_0254'), + ('account', '0006_user_session_keys'), ] operations = [ diff --git a/announcement/migrations/0002_auto_20171011_1214.py b/announcement/migrations/0002_auto_20171011_1214.py index ffe4c969..e2d5abe3 100644 --- a/announcement/migrations/0002_auto_20171011_1214.py +++ b/announcement/migrations/0002_auto_20171011_1214.py @@ -17,4 +17,8 @@ class Migration(migrations.Migration): name='title', field=models.CharField(max_length=64), ), + migrations.AlterModelOptions( + name='announcement', + options={'ordering': ('-create_time',)}, + ), ] diff --git a/contest/migrations/0006_auto_20171011_1214.py b/contest/migrations/0006_auto_20171011_1214.py index d429742f..0134a5bf 100644 --- a/contest/migrations/0006_auto_20171011_1214.py +++ b/contest/migrations/0006_auto_20171011_1214.py @@ -23,4 +23,8 @@ class Migration(migrations.Migration): name='submission_info', field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), ), + migrations.AlterModelOptions( + name='contest', + options={'ordering': ('-start_time',)}, + ), ] diff --git a/oj/settings.py b/oj/settings.py index 9c9ac49f..9d8ea614 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -12,13 +12,13 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ import os from copy import deepcopy -from .custom_settings import * - if os.environ.get("OJ_ENV") == "production": from .production_settings import * else: from .dev_settings import * +from .custom_settings import * + BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Applications diff --git a/submission/migrations/0002_auto_20170509_1203.py b/submission/migrations/0002_auto_20170509_1203.py index 7ca58163..78dcbe9b 100644 --- a/submission/migrations/0002_auto_20170509_1203.py +++ b/submission/migrations/0002_auto_20170509_1203.py @@ -17,4 +17,22 @@ class Migration(migrations.Migration): name='code', field=models.TextField(), ), + migrations.RenameField( + model_name='submission', + old_name='accepted_info', + new_name='statistic_info', + ), + migrations.RemoveField( + model_name='submission', + name='accepted_time', + ), + migrations.RenameField( + model_name='submission', + old_name='created_time', + new_name='create_time', + ), + migrations.AlterModelOptions( + name='submission', + options={'ordering': ('-create_time',)}, + ) ] diff --git a/submission/migrations/0003_auto_20170704_1243.py b/submission/migrations/0003_auto_20170704_1243.py deleted file mode 100644 index 58fa83c3..00000000 --- a/submission/migrations/0003_auto_20170704_1243.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2017-07-04 12:43 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('submission', '0002_auto_20170509_1203'), - ] - - operations = [ - migrations.RenameField( - model_name='submission', - old_name='accepted_info', - new_name='statistic_info', - ), - migrations.RemoveField( - model_name='submission', - name='accepted_time', - ), - ] diff --git a/submission/migrations/0004_auto_20170717_1324.py b/submission/migrations/0004_auto_20170717_1324.py deleted file mode 100644 index c8a5be33..00000000 --- a/submission/migrations/0004_auto_20170717_1324.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2017-07-17 13:24 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('submission', '0003_auto_20170704_1243'), - ] - - operations = [ - migrations.RenameField( - model_name='submission', - old_name='created_time', - new_name='create_time', - ), - migrations.AlterModelOptions( - name='submission', - options={'ordering': ('-create_time',)}, - ) - ] diff --git a/submission/migrations/0005_submission_username.py b/submission/migrations/0005_submission_username.py index 46f63dfd..68a32435 100644 --- a/submission/migrations/0005_submission_username.py +++ b/submission/migrations/0005_submission_username.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('submission', '0004_auto_20170717_1324'), + ('submission', '0002_auto_20170509_1203'), ] operations = [ diff --git a/submission/migrations/0007_auto_20170923_1318.py b/submission/migrations/0007_auto_20170923_1318.py index d498e4cb..63566807 100644 --- a/submission/migrations/0007_auto_20170923_1318.py +++ b/submission/migrations/0007_auto_20170923_1318.py @@ -2,6 +2,7 @@ # Generated by Django 1.11.4 on 2017-09-23 13:18 from __future__ import unicode_literals +import django.contrib.postgres.fields.jsonb from django.db import migrations, models import django.db.models.deletion @@ -33,4 +34,14 @@ class Migration(migrations.Migration): old_name='problem_id', new_name='problem', ), + migrations.AlterField( + model_name='submission', + name='info', + field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), + ), + migrations.AlterField( + model_name='submission', + name='statistic_info', + field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), + ), ] diff --git a/submission/migrations/0008_auto_20171011_1214.py b/submission/migrations/0008_auto_20171011_1214.py deleted file mode 100644 index 1c585d8a..00000000 --- a/submission/migrations/0008_auto_20171011_1214.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-10-11 12:14 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('submission', '0007_auto_20170923_1318'), - ] - - operations = [ - migrations.AlterField( - model_name='submission', - name='info', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), - ), - migrations.AlterField( - model_name='submission', - name='statistic_info', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), - ), - ]