Fix bug in get_indexes affecting the tests

django · Sep 17, 2012 · c5e2eca · c5e2eca
1 parent d0b3536
commit c5e2eca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
@@ -103,6 +103,7 @@ def get_indexes(self, cursor, table_name):
                 continue
             if row[4] not in indexes:
                 indexes[row[4]] = {'primary_key': False, 'unique': False}
+            # It's possible to have the unique and PK constraints in separate indexes.
             if row[2] == 'PRIMARY':
                 indexes[row[4]]['primary_key'] = True
             if not bool(row[1]):

diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql_psycopg2/introspection.py
@@ -86,7 +86,13 @@ def get_indexes(self, cursor, table_name):
             # Here, we skip any indexes across multiple fields.
             if ' ' in row[1]:
                 continue
-            indexes[row[0]] = {'primary_key': row[3], 'unique': row[2]}
+            if row[0] not in indexes:
+                indexes[row[0]] = {'primary_key': False, 'unique': False}
+            # It's possible to have the unique and PK constraints in separate indexes.
+            if row[3]:
+                indexes[row[0]]['primary_key'] = True
+            if row[2]:
+                indexes[row[0]]['unique'] = True
         return indexes
 
     def get_constraints(self, cursor, table_name):