1
0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00

Fixed #23452 -- Prevented infinite migrations for empty unique/index_together.

Thanks fwkroon for the report.
This commit is contained in:
Markus Holtermann
2014-09-09 23:28:45 +02:00
committed by Tim Graham
parent ef8ef2a42d
commit 6d5958c7a3
4 changed files with 62 additions and 14 deletions

View File

@@ -233,9 +233,7 @@ class AlterUniqueTogether(Operation):
def __init__(self, name, unique_together):
self.name = name
unique_together = normalize_together(unique_together)
# need None rather than an empty set to prevent infinite migrations
# after removing unique_together from a model
self.unique_together = set(tuple(cons) for cons in unique_together) or None
self.unique_together = set(tuple(cons) for cons in unique_together)
def state_forwards(self, app_label, state):
model_state = state.models[app_label, self.name.lower()]
@@ -273,9 +271,7 @@ class AlterIndexTogether(Operation):
def __init__(self, name, index_together):
self.name = name
index_together = normalize_together(index_together)
# need None rather than an empty set to prevent infinite migrations
# after removing unique_together from a model
self.index_together = set(tuple(cons) for cons in index_together) or None
self.index_together = set(tuple(cons) for cons in index_together)
def state_forwards(self, app_label, state):
model_state = state.models[app_label, self.name.lower()]