Ticket #5680: autoindex.2.diff

django/db/backends/mysql_old/base.py

@@ -64 +64 @@
             return getattr(self.cursor, attr)
 
 class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
     inline_fk_references = False
 
 class DatabaseOperations(BaseDatabaseOperations):

django/db/backends/mysql/base.py

@@ -60 +60 @@
 # TRADITIONAL will automatically cause most warnings to be treated as errors.
 
 class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
     inline_fk_references = False
 
 class DatabaseOperations(BaseDatabaseOperations):

django/db/backends/__init__.py

@@ -42 +42 @@
 class BaseDatabaseFeatures(object):
     allows_group_by_ordinal = True
     allows_unique_and_pk = True
-    autoindexes_primary_keys = True
     inline_fk_references = True
     needs_datetime_string_cast = True
     needs_upper_for_iops = False

django/core/management/sql.py

@@ -273 +273 @@
             field_output.append(style.SQL_KEYWORD('UNIQUE'))
         if f.primary_key:
             field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))
-        if tablespace and connection.features.supports_tablespaces and (f.unique or f.primary_key) and connection.features.autoindexes_primary_keys:
+        if tablespace and connection.features.supports_tablespaces and (f.unique or f.primary_key):
             # We must specify the index tablespace inline, because we
             # won't be generating a CREATE INDEX statement for this field.
             field_output.append(connection.ops.tablespace_sql(tablespace, inline=True))
@@ -297 +297 @@
         constraint_output = [style.SQL_KEYWORD('UNIQUE')]
         constraint_output.append('(%s)' % \
             ", ".join([style.SQL_FIELD(qn(opts.get_field(f).column)) for f in field_constraints]))
-        if opts.db_tablespace and connection.features.supports_tablespaces \
-               and connection.features.autoindexes_primary_keys:
+        if opts.db_tablespace and connection.features.supports_tablespaces:
             constraint_output.append(connection.ops.tablespace_sql(
                 opts.db_tablespace, inline=True))
         table_output.append(' '.join(constraint_output))
@@ -362 +361 @@
     for f in opts.many_to_many:
         if not isinstance(f.rel, generic.GenericRel):
             tablespace = f.db_tablespace or opts.db_tablespace
-            if tablespace and connection.features.supports_tablespaces and connection.features.autoindexes_primary_keys:
+            if tablespace and connection.features.supports_tablespaces: 
                 tablespace_sql = ' ' + connection.ops.tablespace_sql(tablespace, inline=True)
             else:
                 tablespace_sql = ''
@@ -467 +466 @@
 
     qn = connection.ops.quote_name
     for f in model._meta.fields:
-        if f.db_index and not ((f.primary_key or f.unique) and connection.features.autoindexes_primary_keys):
+        if f.db_index and not (f.primary_key or f.unique):
             unique = f.unique and 'UNIQUE ' or ''
             tablespace = f.db_tablespace or model._meta.db_tablespace
             if tablespace and connection.features.supports_tablespaces: