Ticket #1397: syncdb_initial_sql_data.diff

django/branches/magic-removal/django/core/management.py

@@ -26 +26 @@
 
 INVALID_PROJECT_NAMES = ('django', 'test')
 
+def _get_app_label(app):
+    from django.db.models import get_models
+    app_models = get_models(app)
+    app_label = app_models[0]._meta.app_label
+    return app_label
+
 def _get_packages_insert(app_label):
     from django.db import backend
     return "INSERT INTO %s (%s, %s) VALUES ('%s', '%s');" % \
@@ -338 +344 @@
     app_models = get_models(app)
     app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))
 
+    output.append(_get_packages_insert(_get_app_label(app)))
+
     for klass in app_models:
         opts = klass._meta
 
@@ -415 +423 @@
 
     pending_references = []
 
+    initial_data = []
+
     for app in models.get_apps():
+        is_new_app = True
         model_list = models.get_models(app)
         for model in model_list:
             # Create the model's database table, if it doesn't already exist.
@@ -420 +431 @@
         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:
+                is_new_app = False
                 continue
             field_metadata, table_metadata, references = sql_for_table(model)
             pending_references.extend(references)
@@ -429 +441 @@
             print "Creating table %s" % model._meta.db_table
             cursor.execute(sql)
 
+        if is_new_app:
+            # This is a new app, get initial sql data
+            initial_data.append((_get_app_label(app), get_sql_initial_data(app)))
+
         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:
@@ -454 +470 @@
                 sql = '\n'.join(table_output)
                 print "Creating table %s" % f.m2m_db_table()
                 cursor.execute(sql)
+                
+    # Add initial sql data for the newly installed apps
+    if len(initial_data) > 0:
+        for label, sql_list in initial_data:
+            print "Adding initial sql data for %s" % label
+            for sql in sql_list:
+                cursor.execute(sql)
 
     # Create the pending references.
     # Take care of any ALTER TABLE statements to add constraints