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

django/django/core/management.py

@@ -198 +198 @@
         final_output.append('\n'.join(table_output))
     return final_output
 
+def _get_initial_sql_for_model(model):
+    "Returns a list of the initial INSERT SQL statements for the given model."
+    from django.conf import settings
+    from django.db.models.loading import get_app
+
+    module_name = model._meta.module_name
+    app = get_app(model._meta.app_label)
+    app_sql_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
+
+    sql_files = [os.path.join(app_sql_dir, module_name + '.' + settings.DATABASE_ENGINE +  '.sql'),
+                 os.path.join(app_sql_dir, module_name + '.sql')]
+
+    final_output = []
+    for sql_file in sql_files:
+        if os.path.exists(sql_file):
+            fp = open(sql_file)
+            final_output.append(fp.read())
+            fp.close()
+    return final_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, transaction
@@ -315 +335 @@
     from django.conf import settings
     from django.db.models import get_models
     output = []
-
-    app_models = get_models(app)
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
-
-    for klass in app_models:
-        opts = klass._meta
-
-        # Add custom SQL, if it's available.
-        # TODO: This probably needs changing
-        sql_files = [os.path.join(app_dir, opts.module_name + '.' + settings.DATABASE_ENGINE +  '.sql'),
-                     os.path.join(app_dir, opts.module_name + '.sql')]
-        for sql_file in sql_files:
-            if os.path.exists(sql_file):
-                fp = open(sql_file)
-                output.append(fp.read())
-                fp.close()
-
-        # TODO: This is temporarily commented out until we come up
-        # with a better way of letting people initialize permissions.
-#         # Permissions.
-#         for codename, name in _get_all_permissions(opts):
-#             output.append(_get_permission_insert(name, codename, opts))
+    for model in get_models(app):
+        output.extend(_get_initial_sql_for_model(model))
     return output
-get_sql_initial_data.help_doc = "Prints the initial INSERT SQL statements for the given app name(s)."
+get_sql_initial_data.help_doc = "Prints the initial INSERT SQL statements for the given app name."
 get_sql_initial_data.args = APP_ARGS
 
 def get_sql_sequence_reset(app):
@@ -430 +430 @@
                     for statement in sql:
                         cursor.execute(statement)
 
+    # Add initial sql data if any for the newly created models
+    for model in model_list:
+        if model in created_models:
+            sql = _get_initial_sql_for_model(model)
+            if sql:
+                print "Adding initial sql data for %s" % model._meta.db_table
+                for statement in sql:
+                    cursor.execute(statement)
+
     transaction.commit_unless_managed()
 syncdb.args = ''