Changeset 7790

Timestamp:

06/29/08 23:46:59 (2 months ago)

Author:

mtredinnick

Message:

Make sure we only create the minimum number of table indexes for MySQL.

This patch simplifies a bunch of code for all backends and removes some
duplicate index creation for MySQL, in particular (versions 4.x and later).
Patch from Nis Jørgensen.

Fixed #5671, #5680, #7170, #7186.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management/commands/createcachetable.py (modified) (1 diff)
• django/trunk/django/core/management/sql.py (modified) (4 diffs)
• django/trunk/django/db/backends/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -193 +193 @@
-    jcrasta@gmail.com
-    Zak Johnson <zakj@nox.cx>
+    Nis Jørgensen <nis@superlativ.dk>
-    Michael Josephson <http://www.sdjournal.com/>
-    jpellerin@gmail.com

django/trunk/django/core/management/commands/createcachetable.py

@@ -22 +22 @@
-            field_output = [qn(f.name), f.db_type()]
-            field_output.append("%sNULL" % (not f.null and "NOT " or ""))
-            if f.unique:
-                field_output.append("UNIQUE")
-            if f.primary_key:
-                field_output.append("PRIMARY KEY")
+            elif f.unique:
+                field_output.append("UNIQUE")
-            if f.db_index:
-                unique = f.unique and "UNIQUE " or ""

django/trunk/django/core/management/sql.py

@@ -269 +269 @@
-            style.SQL_COLTYPE(col_type)]
-        field_output.append(style.SQL_KEYWORD('%sNULL' % (not f.null and 'NOT ' or '')))
-        if f.unique and (not f.primary_key or connection.features.allows_unique_and_pk):
-            field_output.append(style.SQL_KEYWORD('UNIQUE'))
-        if f.primary_key:
-            field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))
-
+
+
+
-            # We must specify the index tablespace inline, because we
-            # won't be generating a CREATE INDEX statement for this field.
@@ -356 +356 @@
-        if not isinstance(f.rel, generic.GenericRel):
-            tablespace = f.db_tablespace or opts.db_tablespace
- and connection.features.autoindexes_primary_keys:
+: 
-                tablespace_sql = ' ' + connection.ops.tablespace_sql(tablespace, inline=True)
-            else:
@@ -461 +461 @@
-    qn = connection.ops.quote_name
-    for f in model._meta.local_fields:
-
-
+
-            tablespace = f.db_tablespace or model._meta.db_tablespace
-            if tablespace and connection.features.supports_tablespaces:
@@ -469 +468 @@
-                tablespace_sql = ''
-            output.append(
-%sINDEX' % unique
+INDEX'
-                style.SQL_TABLE(qn('%s_%s' % (model._meta.db_table, f.column))) + ' ' + \
-                style.SQL_KEYWORD('ON') + ' ' + \

django/trunk/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

django/trunk/django/db/backends/mysql/base.py

@@ -61 +61 @@
-
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
-    inline_fk_references = False
-    empty_fetchmany_value = ()

django/trunk/django/db/backends/mysql_old/base.py

@@ -65 +65 @@
-
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
-    inline_fk_references = False
-    empty_fetchmany_value = ()

django/trunk/django/db/backends/oracle/base.py

@@ -25 +25 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    allows_group_by_ordinal = False
-    allows_unique_and_pk = False        # Suppress UNIQUE/PK for Oracle (ORA-02259)
-    empty_fetchmany_value = ()
-    needs_datetime_string_cast = False

django/trunk/django/db/models/fields/__init__.py

@@ -92 +92 @@
-        self.verbose_name = verbose_name
-        self.primary_key = primary_key
-
+_
-        self.blank, self.null = blank, null
-        # Oracle treats the empty string ('') as null, so coerce the null
@@ -168 +168 @@
-        except KeyError:
-            return None
+
+    def unique(self):
+        return self._unique or self.primary_key
+    unique = property(unique)
-
-    def validate_full(self, field_data, all_data):