Changeset 6650

Timestamp:

11/04/07 00:05:24 (10 months ago)

Author:

mtredinnick

Message:

Fixed #5729 -- For MySQL (only), always delay the creation of foreign key
references, for all tables, until after the table has been created. This means
that when using the InnoDB storage engine, true foreign key constraints are
created (inline "REFERENCES" are ignored by InnoDB, unfortunately).

Fully backwards compatible.

Files:

• django/trunk/django/core/management/sql.py (modified) (5 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/core/management/sql.py

@@ -253 +253 @@
-    pending_references = {}
-    qn = connection.ops.quote_name
+    inline_references = connection.features.inline_fk_references
-    for f in opts.fields:
-        col_type = f.db_type()
@@ -273 +274 @@
-            field_output.append(connection.ops.tablespace_sql(tablespace, inline=True))
-        if f.rel:
-
+inline_references and 
-                field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
-                    style.SQL_TABLE(qn(f.rel.to._meta.db_table)) + ' (' + \
@@ -342 +343 @@
-    from django.db import connection, models
-    from django.contrib.contenttypes import generic
+    from django.db.backends.util import truncate_name
-
-    opts = model._meta
-    final_output = []
-    qn = connection.ops.quote_name
+    inline_references = connection.features.inline_fk_references
-    for f in opts.many_to_many:
-        if not isinstance(f.rel, generic.GenericRel):
@@ -355 +358 @@
-            table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \
-                style.SQL_TABLE(qn(f.m2m_db_table())) + ' (']
- \
+
-                (style.SQL_FIELD(qn('id')),
-                style.SQL_COLTYPE(models.AutoField(primary_key=True).db_type()),
-                style.SQL_KEYWORD('NOT NULL PRIMARY KEY'),
-                tablespace_sql))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                (style.SQL_KEYWORD('UNIQUE'),
-                style.SQL_FIELD(qn(f.m2m_column_name())),
@@ -385 +405 @@
-            table_output.append(';')
-            final_output.append('\n'.join(table_output))
+
+            for r_table, r_col, table, col in deferred:
+                r_name = '%s_refs_%s_%x' % (r_col, col,
+                        abs(hash((r_table, table))))
+                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % 
+                (qn(r_table),
+                truncate_name(r_name, connection.ops.max_name_length()),
+                qn(r_col), qn(table), qn(col),
+                connection.ops.deferrable_sql()))
-
-            # Add any extra SQL needed to support auto-incrementing PKs

django/trunk/django/db/backends/__init__.py

@@ -44 +44 @@
-    allows_unique_and_pk = True
-    autoindexes_primary_keys = True
+    inline_fk_references = True
-    needs_datetime_string_cast = True
-    needs_upper_for_iops = False

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

@@ -62 +62 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
+    inline_fk_references = False
-
-class DatabaseOperations(BaseDatabaseOperations):

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

@@ -66 +66 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
+    inline_fk_references = False
-
-class DatabaseOperations(BaseDatabaseOperations):