mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #22035 -- reordered migration operations

Browse Source 
Now AddField actions appear in operations list before AlterUniqueTogether
actions.

Thanks to SmileyChris for the report.
This commit is contained in:
Anton Baklanov
2014-02-13 16:04:19 +02:00
committed by Tim Graham
parent f683cb90be
commit 0bd92d68ad
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/migrations/autodetector.py
View File

@@ -169,6 +169,7 @@ class MigrationAutodetector(object):
kept_models = set(old_model_keys).intersection(new_model_keys)
old_fields = set()
new_fields = set()
unique_together_operations = []
for app_label, model_name in kept_models:
old_model_state = self.from_state.models[app_label, model_name]
new_model_state = self.to_state.models[app_label, model_name]
@@ -176,15 +177,16 @@ class MigrationAutodetector(object):
# always come before AlterFields even on separate models)
old_fields.update((app_label, model_name, x) for x, y in old_model_state.fields)
new_fields.update((app_label, model_name, x) for x, y in new_model_state.fields)
# Unique_together changes
# Unique_together changes. Operations will be added to migration a
# bit later, after fields creation. See ticket #22035.
if old_model_state.options.get("unique_together", set()) != new_model_state.options.get("unique_together", set()):
self.add_to_migration(
unique_together_operations.append((
app_label,
operations.AlterUniqueTogether(
name=model_name,
unique_together=new_model_state.options.get("unique_together", set()),
)
)
))
# New fields
for app_label, model_name, field_name in new_fields - old_fields:
old_model_state = self.from_state.models[app_label, model_name]
@@ -263,6 +265,8 @@ class MigrationAutodetector(object):
field=new_model_state.get_field_by_name(field_name),
)
)
for app_label, operation in unique_together_operations:
self.add_to_migration(app_label, operation)
# Alright, now add internal dependencies
for app_label, migrations in self.migrations.items():
for m1, m2 in zip(migrations, migrations[1:]):