Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix bug in get_indexes affecting the tests

  • Loading branch information...
commit c5e2ecae6949d4e89530610d768bbbd563ddc19b 1 parent d0b3536
Andrew Godwin andrewgodwin authored
1  django/db/backends/mysql/introspection.py
View
@@ -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]):
8 django/db/backends/postgresql_psycopg2/introspection.py
View
@@ -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):
Please sign in to comment.
Something went wrong with that request. Please try again.