Ticket #11074: ticket_11074_against_r10706.diff

django/core/management/commands/syncdb.py

@@ -19 +19 @@
     def handle_noargs(self, **options):
         from django.db import connection, transaction, models
         from django.conf import settings
-        from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal
+        from django.core.management.sql import custom_field_sql_for_model, initial_sql_for_model, emit_post_sync_signal
 
         verbosity = int(options.get('verbosity', 1))
         interactive = options.get('interactive')
@@ -100 +100 @@
 
         # The connection may have been closed by a syncdb handler.
         cursor = connection.cursor()
+        
+        def execute_custom_sql(label, sql_statements, app_name, model):
+            if verbosity >= 1:
+                print "Installing %s SQL for %s.%s model" % (label, app_name, model._meta.object_name)
+            try:
+                for sql in sql_statements:
+                    cursor.execute(sql)
+            except Exception, e:
+                sys.stderr.write("Failed to install %s SQL for %s.%s model: %s\n" % \
+                                 (label, app_name, model._meta.object_name, e))
+                if show_traceback:
+                    import traceback
+                    traceback.print_exc()
+                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)
@@ -107 +123 @@
             app_name = app.__name__.split('.')[-2]
             for model in models.get_models(app):
                 if model in created_models:
-                    custom_sql = custom_sql_for_model(model, self.style)
-                    if custom_sql:
-                        if verbosity >= 1:
-                            print "Installing custom SQL for %s.%s model" % (app_name, model._meta.object_name)
-                        try:
-                            for sql in custom_sql:
-                                cursor.execute(sql)
-                        except Exception, e:
-                            sys.stderr.write("Failed to install custom SQL for %s.%s model: %s\n" % \
-                                                (app_name, model._meta.object_name, e))
-                            if show_traceback:
-                                import traceback
-                                traceback.print_exc()
-                            transaction.rollback_unless_managed()
-                        else:
-                            transaction.commit_unless_managed()
+                    custom_field_sql = custom_field_sql_for_model(model, self.style)
+                    initial_sql = initial_sql_for_model(model, self.style)
+                    if custom_field_sql:
+                        execute_custom_sql('custom field', custom_field_sql, app_name, model)
                     else:
                         if verbosity >= 2:
-                            print "No custom SQL for %s.%s model" % (app_name, model._meta.object_name)
+                            print "No custom field SQL for %s.%s model" % (app_name, model._meta.object_name)
+                    if initial_sql:
+                        execute_custom_sql('initial', initial_sql, app_name, model)
+                    else:
+                        if verbosity >= 2:
+                            print "No initial 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]
@@ -148 +158 @@
         # Install the 'initial_data' fixture, using format discovery
         from django.core.management import call_command
         call_command('loaddata', 'initial_data', verbosity=verbosity)
+

django/core/management/sql.py

@@ -137 +137 @@
     output = []
 
     app_models = get_models(app)
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
 
     for model in app_models:
         output.extend(custom_sql_for_model(model, style))
@@ -156 +155 @@
     "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)
 
-def custom_sql_for_model(model, style):
+def custom_field_sql_for_model(model, style):
     from django.db import models
-    from django.conf import settings
 
     opts = model._meta
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
     output = []
 
     # Post-creation SQL should come before any initial SQL data is loaded.
     # However, this should not be done for fields that are part of a a parent
     # model (via model inheritance).
-    nm = opts.init_name_map()
     post_sql_fields = [f for f in opts.local_fields if hasattr(f, 'post_create_sql')]
     for f in post_sql_fields:
         output.extend(f.post_create_sql(style, model._meta.db_table))
 
+    return output
+
+def initial_sql_for_model(model, style):
+    from django.db import models
+    from django.conf import settings
+
+    opts = model._meta
+    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
+    output = []
+
     # Some backends can't execute more than one SQL statement at a time,
     # so split into separate statements.
     statements = re.compile(r";[ \t]*$", re.M)
@@ -191 +197 @@
 
     return output
 
-
 def emit_post_sync_signal(created_models, verbosity, interactive):
     from django.db import models
     from django.dispatch import dispatcher