From 49dc1e7d28477534daa61a34df2f0308742287e4 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Mon, 24 Sep 2012 13:15:08 +0100 Subject: [PATCH] Fix altering of indexes alongside uniques --- django/db/backends/schema.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py index 09d1202aad..960fd7035d 100644 --- a/django/db/backends/schema.py +++ b/django/db/backends/schema.py @@ -397,7 +397,7 @@ class BaseDatabaseSchemaEditor(object): }, ) # Removed an index? - if old_field.db_index and not new_field.db_index and not old_field.unique and not new_field.unique: + if old_field.db_index and not new_field.db_index and not old_field.unique and not (not new_field.unique and old_field.unique): # Find the index for this field index_names = self._constraint_names(model, [old_field.column], index=True) if strict and len(index_names) != 1: @@ -525,7 +525,7 @@ class BaseDatabaseSchemaEditor(object): } ) # Added an index? - if not old_field.db_index and new_field.db_index and not old_field.unique and not new_field.unique: + if not old_field.db_index and new_field.db_index and not new_field.unique and not (not old_field.unique and new_field.unique): self.execute( self.sql_create_index % { "table": self.quote_name(model._meta.db_table),