Ticket #15933: django_mysql4_multiple_keys_keep_primary.diff

django/db/backends/mysql/introspection.py

@@ -93 +93 @@
         cursor.execute("SHOW INDEX FROM %s" % self.connection.ops.quote_name(table_name))
         indexes = {}
         for row in cursor.fetchall():
-            indexes[row[4]] = {'primary_key': (row[2] == 'PRIMARY'), 'unique': not bool(row[1])}
+            if indexes.has_key(row[4]) and indexes[row[4]]['primary_key'] == True:
+                indexes[row[4]]['unique'] = not bool(row[1])
+            else:
+                indexes[row[4]] = {'primary_key': (row[2] == 'PRIMARY'), 'unique': not bool(row[1])}
         return indexes