Ticket #2229: m2m_syncdb.patch

django/core/management.py

@@ -238 +238 @@
     return final_output
 
 def _get_many_to_many_sql_for_model(model):
-    from django.db import backend, get_creation_module
     from django.db.models import GenericRel
 
-    data_types = get_creation_module().DATA_TYPES
-
     opts = model._meta
     final_output = []
     for f in opts.many_to_many:
         if not isinstance(f.rel, GenericRel):
-            table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \
-                style.SQL_TABLE(backend.quote_name(f.m2m_db_table())) + ' (']
-            table_output.append('    %s %s %s,' % \
-                (style.SQL_FIELD(backend.quote_name('id')),
-                style.SQL_COLTYPE(data_types['AutoField']),
-                style.SQL_KEYWORD('NOT NULL PRIMARY KEY')))
-            table_output.append('    %s %s %s %s (%s)%s,' % \
-                (style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
-                style.SQL_COLTYPE(data_types[get_rel_data_type(opts.pk)] % opts.pk.__dict__),
-                style.SQL_KEYWORD('NOT NULL REFERENCES'),
-                style.SQL_TABLE(backend.quote_name(opts.db_table)),
-                style.SQL_FIELD(backend.quote_name(opts.pk.column)),
-                backend.get_deferrable_sql()))
-            table_output.append('    %s %s %s %s (%s)%s,' % \
-                (style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name())),
-                style.SQL_COLTYPE(data_types[get_rel_data_type(f.rel.to._meta.pk)] % f.rel.to._meta.pk.__dict__),
-                style.SQL_KEYWORD('NOT NULL REFERENCES'),
-                style.SQL_TABLE(backend.quote_name(f.rel.to._meta.db_table)),
-                style.SQL_FIELD(backend.quote_name(f.rel.to._meta.pk.column)),
-                backend.get_deferrable_sql()))
-            table_output.append('    %s (%s, %s)' % \
-                (style.SQL_KEYWORD('UNIQUE'),
-                style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
-                style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name()))))
-            table_output.append(');')
-            final_output.append('\n'.join(table_output))
+            final_output.append(_get_many_to_many_sql_for_field(f, opts))
     return final_output
 
+def _get_many_to_many_sql_for_field(f, opts):
+    """
+    Returns the SQL for creating a many-to-many table.
+    Takes a many-to-many field and opts for the model it belongs to.
+    """
+    from django.db import backend, get_creation_module
+    data_types = get_creation_module().DATA_TYPES
+
+    table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \
+        style.SQL_TABLE(backend.quote_name(f.m2m_db_table())) + ' (']
+    table_output.append('    %s %s %s,' % \
+        (style.SQL_FIELD(backend.quote_name('id')),
+        style.SQL_COLTYPE(data_types['AutoField']),
+        style.SQL_KEYWORD('NOT NULL PRIMARY KEY')))
+    table_output.append('    %s %s %s %s (%s)%s,' % \
+        (style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
+        style.SQL_COLTYPE(data_types[get_rel_data_type(opts.pk)] % opts.pk.__dict__),
+        style.SQL_KEYWORD('NOT NULL REFERENCES'),
+        style.SQL_TABLE(backend.quote_name(opts.db_table)),
+        style.SQL_FIELD(backend.quote_name(opts.pk.column)),
+        backend.get_deferrable_sql()))
+    table_output.append('    %s %s %s %s (%s)%s,' % \
+        (style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name())),
+        style.SQL_COLTYPE(data_types[get_rel_data_type(f.rel.to._meta.pk)] % f.rel.to._meta.pk.__dict__),
+        style.SQL_KEYWORD('NOT NULL REFERENCES'),
+        style.SQL_TABLE(backend.quote_name(f.rel.to._meta.db_table)),
+        style.SQL_FIELD(backend.quote_name(f.rel.to._meta.pk.column)),
+        backend.get_deferrable_sql()))
+    table_output.append('    %s (%s, %s)' % \
+        (style.SQL_KEYWORD('UNIQUE'),
+        style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
+        style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name()))))
+    table_output.append(');')
+    return '\n'.join(table_output)
+
 def get_sql_delete(app):
     "Returns a list of the DROP TABLE SQL statements for the given app."
     from django.db import backend, connection, models, get_introspection_module
@@ -534 +541 @@
             table_list.append(model._meta.db_table)
 
         for model in model_list:
-            if model in created_models:
-                sql = _get_many_to_many_sql_for_model(model)
-                if sql:
-                    if verbosity >= 2:
-                        print "Creating many-to-many tables for %s.%s model" % (app_name, model._meta.object_name)
-                    for statement in sql:
-                        cursor.execute(statement)
+            opts = model._meta
+            for field in opts.many_to_many:
+                if isinstance(field.rel, models.GenericRel) or field.m2m_db_table() in table_list:
+                    continue
+                sql = _get_many_to_many_sql_for_field(field, opts)
+                if verbosity >= 2:
+                    print "Creating many-to-many table %s for %s.%s model" % (field.m2m_db_table(), app_name, opts.object_name)
+                cursor.execute(sql)
 
         transaction.commit_unless_managed()