test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in get_indexes affecting the tests

This commit is contained in:
Andrew Godwin 2012-09-17 23:45:00 +01:00
parent d0b3536964
commit c5e2ecae69
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/backends/mysql/introspection.py
View File

@ -103,6 +103,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
continue continue
if row[4] not in indexes: if row[4] not in indexes:
indexes[row[4]] = {'primary_key': False, 'unique': False} 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': if row[2] == 'PRIMARY':
indexes[row[4]]['primary_key'] = True indexes[row[4]]['primary_key'] = True
if not bool(row[1]): if not bool(row[1]):

8
django/db/backends/postgresql_psycopg2/introspection.py
View File

@ -86,7 +86,13 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
# Here, we skip any indexes across multiple fields. # Here, we skip any indexes across multiple fields.
if ' ' in row[1]: if ' ' in row[1]:
continue 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 return indexes
def get_constraints(self, cursor, table_name): def get_constraints(self, cursor, table_name):