Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed get_indexes() hook from [2346] to return 'primary_key' instea…

…d of 'keyname'

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5710c6e2db54173b12a5f2789a07c89ae3eda68b 1 parent 27b41fd
@adrianholovaty adrianholovaty authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 django/core/db/backends/mysql.py
  2. +1 −1  django/core/management.py
View
4 django/core/db/backends/mysql.py
@@ -139,13 +139,13 @@ def get_indexes(cursor, table_name):
"""
Returns a dictionary of fieldname -> infodict for the given table,
where each infodict is in the format:
- {'keyname': 'name of key',
+ {'primary_key': boolean representing whether it's the primary key,
'unique': boolean representing whether it's a unique index}
"""
cursor.execute("SHOW INDEX FROM %s" % DatabaseWrapper().quote_name(table_name))
indexes = {}
for row in cursor.fetchall():
- indexes[row[4]] = {'keyname': row[2], 'unique': not bool(row[1])}
+ indexes[row[4]] = {'primary_key': (row[2] == 'PRIMARY'), 'unique': not bool(row[1])}
return indexes
OPERATOR_MAPPING = {
View
2  django/core/management.py
@@ -636,7 +636,7 @@ def table2model(table_name):
# Add primary_key and unique, if necessary.
column_name = extra_params.get('db_column', att_name)
if column_name in indexes:
- if indexes[column_name]['keyname'] == 'PRIMARY':
+ if indexes[column_name]['primary_key']:
extra_params['primary_key'] = True
elif indexes[column_name]['unique']:
extra_params['unique'] = True
Please sign in to comment.
Something went wrong with that request. Please try again.