Ticket #7589: gis_post_create_sql.diff

commands/sqlcustom.py

@@ -7 +7 @@
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_custom
-        return u'\n'.join(sql_custom(app)).encode('utf-8')
+        return u'\n'.join(sql_custom(app, self.style)).encode('utf-8')

commands/syncdb.py

@@ -112 +112 @@
             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)
+                    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)

sql.py

@@ -219 +219 @@
     statements = connection.ops.sql_flush(style, tables, sequence_list())
     return statements
 
-def sql_custom(app):
+def sql_custom(app, style):
     "Returns a list of the custom table modifying SQL statements for the given app."
     from django.db.models import get_models
     output = []
@@ -228 +228 @@
     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))
+        output.extend(custom_sql_for_model(model, style))
 
     return output
 
@@ -242 +242 @@
 
 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) + sql_indexes(app, style)
+    return sql_create(app, style) + sql_custom(app, style) + sql_indexes(app, style)
 
 def sql_model_create(model, style, known_models=set()):
     """
@@ -426 +426 @@
 
     return final_output
 
-def custom_sql_for_model(model):
+def custom_sql_for_model(model, style):
     from django.db import models
     from django.conf import settings
 
@@ -434 +434 @@
     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.fields if nm[f.name][1] is None and hasattr(f, '_post_create_sql')]
+    for f in post_sql_fields:
+        output.extend(f._post_create_sql(style, model._meta.db_table))
+
     # 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)