Ticket #10236: change_syncdb_order.patch

django/core/management/commands/syncdb.py

@@ -100 +100 @@
         # The connection may have been closed by a syncdb handler.
         cursor = connection.cursor()
 
+        # Install SQL indicies for all newly created models
+        for app in models.get_apps():
+            app_name = app.__name__.split('.')[-2]
+            for model in models.get_models(app):
+                if model in created_models:
+                    index_sql = connection.creation.sql_indexes_for_model(model, self.style)
+                    if index_sql:
+                        if verbosity >= 1:
+                            print "Installing index for %s.%s model" % (app_name, model._meta.object_name)
+                        try:
+                            for sql in index_sql:
+                                cursor.execute(sql)
+                        except Exception, e:
+                            sys.stderr.write("Failed to install index for %s.%s model: %s\n" % \
+                                                (app_name, model._meta.object_name, e))
+                            transaction.rollback_unless_managed()
+                        else:
+                            transaction.commit_unless_managed()
+
         # Install custom SQL for the app (but only if this
         # is a model we've just created)
         for app in models.get_apps():
@@ -125 +144 @@
                     else:
                         if verbosity >= 2:
                             print "No custom SQL for %s.%s model" % (app_name, model._meta.object_name)
-        # Install SQL indicies for all newly created models
-        for app in models.get_apps():
-            app_name = app.__name__.split('.')[-2]
-            for model in models.get_models(app):
-                if model in created_models:
-                    index_sql = connection.creation.sql_indexes_for_model(model, self.style)
-                    if index_sql:
-                        if verbosity >= 1:
-                            print "Installing index for %s.%s model" % (app_name, model._meta.object_name)
-                        try:
-                            for sql in index_sql:
-                                cursor.execute(sql)
-                        except Exception, e:
-                            sys.stderr.write("Failed to install index for %s.%s model: %s\n" % \
-                                                (app_name, model._meta.object_name, e))
-                            transaction.rollback_unless_managed()
-                        else:
-                            transaction.commit_unless_managed()
 
         # Install the 'initial_data' fixture, using format discovery
         from django.core.management import call_command

django/core/management/sql.py

@@ -153 +153 @@
     return output
 
 def sql_all(app, style):
-    "Returns a list of CREATE TABLE SQL, initial-data inserts, and CREATE INDEX SQL for the given module."
-    return sql_create(app, style) + sql_custom(app, style) + sql_indexes(app, style)
+    "Returns a list of CREATE TABLE SQL, CREATE INDEX SQL and custom SQL for the given module."
+    return sql_create(app, style) + sql_indexes(app, style) + sql_custom(app, style)
 
 def custom_sql_for_model(model, style):
     from django.db import models