From feded19104b14bc28aaccf550265157df84593ba Mon Sep 17 00:00:00 2001 From: Andrzej Pragacz Date: Sat, 15 Nov 2014 15:43:06 +0100 Subject: [1.7.x] Fixed #23794 -- Fixed migrations crash when removing a field that's part of index/unique_together. Backport of 72729f844e0dd9bd01b3874171b89ab0d136a40e from master --- django/db/migrations/autodetector.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'django') 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, )) -- cgit v1.3