Ticket #1438: syncdb-inital-sql-data-2.diff

django/django/core/management.py

@@ -328 +328 @@
 get_sql_reset.help_doc = "Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s)."
 get_sql_reset.args = APP_ARGS
 
-def get_sql_initial_data(app):
+def get_sql_initial_data(app, model_list=None):
     "Returns a list of the initial INSERT SQL statements for the given app."
     from django.conf import settings
     from django.db.models import get_models
@@ -334 +334 @@
     from django.db.models import get_models
     output = []
 
-    app_models = get_models(app)
+    if model_list is not None:
+        app_models = model_list
+    else:
+        app_models = get_models(app)
     app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
 
     for klass in app_models:
@@ -413 +416 @@
     table_list = introspection_module.get_table_list(cursor)
 
     pending_references = []
+    pending_initial_data = []
 
     for app in models.get_apps():
         model_list = models.get_models(app)
+        new_models = []
         for model in model_list:
             # Create the model's database table, if it doesn't already exist.
             if model._meta.db_table in table_list:
@@ -420 +425 @@
             # Create the model's database table, if it doesn't already exist.
             if model._meta.db_table in table_list:
                 continue
+            new_models.append(model)
             field_metadata, table_metadata, references = sql_for_table(model)
             pending_references.extend(references)
             sql = "CREATE TABLE %s (\n    %s\n)" % \
@@ -428 +434 @@
             print "Creating table %s" % model._meta.db_table
             cursor.execute(sql)
 
+        if len(new_models) > 0:
+            # Remember to add initial sql data for the new modules
+            pending_initial_data.append((app, new_models))
+
         for model in model_list:
             # Create the many-to-many join table, if it doesn't already exist.
             for f in model._meta.many_to_many:
@@ -470 +480 @@
                 backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col))
             cursor.execute(sql)
 
+    # Add initial sql data for the newly installed apps and or models
+    if len(pending_initial_data) > 0:
+        for app, model_list in pending_initial_data:
+            for model in model_list:
+                sql_list = get_sql_initial_data(app, [model])
+                if len(sql_list) > 0:
+                    print "Adding initial sql data for %s" % model._meta.db_table
+                    for sql in sql_list:
+                        cursor.execute(sql)
+
+
     transaction.commit_unless_managed()
 syncdb.args = ''