test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Ignore more blank throughs on swapped-out M2Ms

This commit is contained in:
Andrew Godwin 2014-06-16 15:09:27 -07:00
parent 71f573330b
commit 095f73aa22
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,12 +417,14 @@ class MigrationAutodetector(object):
if field.rel: if field.rel:
if field.rel.to: if field.rel.to:
related_fields[field.name] = field related_fields[field.name] = field
if hasattr(field.rel, "through") and not field.rel.through._meta.auto_created: # through will be none on M2Ms on swapped-out models;
# we can treat lack of through as auto_created=True, though.
if getattr(field.rel, "through", None) and not field.rel.through._meta.auto_created:
related_fields[field.name] = field related_fields[field.name] = field
for field in self.new_apps.get_model(app_label, model_name)._meta.local_many_to_many: for field in self.new_apps.get_model(app_label, model_name)._meta.local_many_to_many:
if field.rel.to: if field.rel.to:
related_fields[field.name] = field related_fields[field.name] = field
if hasattr(field.rel, "through") and not field.rel.through._meta.auto_created: if getattr(field.rel, "through", None) and not field.rel.through._meta.auto_created:
related_fields[field.name] = field related_fields[field.name] = field
# Are there unique/index_together to defer? # Are there unique/index_together to defer?
unique_together = model_state.options.pop('unique_together', None) unique_together = model_state.options.pop('unique_together', None)
@ -567,12 +569,14 @@ class MigrationAutodetector(object):
if field.rel: if field.rel:
if field.rel.to: if field.rel.to:
related_fields[field.name] = field related_fields[field.name] = field
if hasattr(field.rel, "through") and not field.rel.through._meta.auto_created: # through will be none on M2Ms on swapped-out models;
# we can treat lack of through as auto_created=True, though.
if getattr(field.rel, "through", None) and not field.rel.through._meta.auto_created:
related_fields[field.name] = field related_fields[field.name] = field
for field in model._meta.local_many_to_many: for field in model._meta.local_many_to_many:
if field.rel.to: if field.rel.to:
related_fields[field.name] = field related_fields[field.name] = field
if hasattr(field.rel, "through") and not field.rel.through._meta.auto_created: if getattr(field.rel, "through", None) and not field.rel.through._meta.auto_created:
related_fields[field.name] = field related_fields[field.name] = field
# Generate option removal first # Generate option removal first
unique_together = model_state.options.pop('unique_together', None) unique_together = model_state.options.pop('unique_together', None)