mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-12-28 16:12:13 +00:00
合并部分migrations
This commit is contained in:
parent
aa4240790b
commit
8e026d7711
@ -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',
|
||||
)
|
||||
]
|
||||
|
@ -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',
|
||||
),
|
||||
]
|
@ -9,7 +9,7 @@ import jsonfield.fields
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('account', '0004_remove_userprofile_time_zone'),
|
||||
('account', '0003_userprofile_total_score'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
|
@ -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),
|
||||
),
|
||||
]
|
||||
|
@ -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),
|
||||
),
|
||||
]
|
@ -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 = [
|
||||
|
@ -17,4 +17,8 @@ class Migration(migrations.Migration):
|
||||
name='title',
|
||||
field=models.CharField(max_length=64),
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='announcement',
|
||||
options={'ordering': ('-create_time',)},
|
||||
),
|
||||
]
|
||||
|
@ -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',)},
|
||||
),
|
||||
]
|
||||
|
@ -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
|
||||
|
@ -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',)},
|
||||
)
|
||||
]
|
||||
|
@ -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',
|
||||
),
|
||||
]
|
@ -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',)},
|
||||
)
|
||||
]
|
@ -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 = [
|
||||
|
@ -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),
|
||||
),
|
||||
]
|
||||
|
@ -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),
|
||||
),
|
||||
]
|
Loading…
Reference in New Issue
Block a user