summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/autodetector.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
index d66817a63c..d5286c7351 100644
--- a/django/db/migrations/autodetector.py
+++ b/django/db/migrations/autodetector.py
@@ -374,17 +374,11 @@ class MigrationAutodetector(object):
)
# Field is removed and part of an index/unique_together
elif dependency[2] is not None and dependency[3] == "foo_together_change":
- if operation.name.lower() == dependency[1].lower():
- return (
- (
- isinstance(operation, operations.AlterUniqueTogether) and
- any(dependency[2] not in t for t in operation.unique_together)
- ) or
- (
- isinstance(operation, operations.AlterIndexTogether) and
- any(dependency[2] not in t for t in operation.index_together)
- )
- )
+ return (
+ isinstance(operation, (operations.AlterUniqueTogether,
+ operations.AlterIndexTogether)) and
+ operation.name.lower() == dependency[1].lower()
+ )
# Unknown dependency. Raise an error.
else:
raise ValueError("Can't handle dependency %r" % (dependency, ))