diff options
| author | Tim Graham <timograham@gmail.com> | 2014-07-24 13:36:15 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-07-24 14:27:10 -0400 |
| commit | 64e75c47ef8dd3c61b85798c7bb34e48c52ccc96 (patch) | |
| tree | ab9dc50971a0603c7cad0075f9adf0b3cd4cd713 /django | |
| parent | b1abfb3c59467d0bb088e19be76fc42fcb570835 (diff) | |
Fixed #23014 -- Infinite migration regression with unique/index_together.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/migrations/autodetector.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index 37824e169c..36f0f020b2 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -795,13 +795,13 @@ class MigrationAutodetector(object): if old_model_state.options.get(option_name) is None: old_value = None else: - old_value = [ - [ + old_value = set([ + tuple( self.renamed_fields.get((app_label, model_name, n), n) for n in unique - ] + ) for unique in old_model_state.options[option_name] - ] + ]) if old_value != new_model_state.options.get(option_name): self.add_operation( app_label, |