Merge branch 'master' of github.com:django/django into schema-alteration

Conflicts:
	django/db/backends/postgresql_psycopg2/base.py

2 files changed, 21 insertions, 5 deletions

diff --git a/tests/regressiontests/initial_sql_regress/sql/simple.sql b/tests/regressiontests/initial_sql_regress/sql/simple.sql
index ca9bd40dab..39363baa9a 100644
--- a/tests/regressiontests/initial_sql_regress/sql/simple.sql
+++ b/tests/regressiontests/initial_sql_regress/sql/simple.sql
@@ -1,4 +1,6 @@
-INSERT INTO initial_sql_regress_simple (name) VALUES ('John');
+-- a comment
+INSERT INTO initial_sql_regress_simple (name) VALUES ('John'); -- another comment
+INSERT INTO initial_sql_regress_simple (name) VALUES ('-- Comment Man');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Paul');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Ringo');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
diff --git a/tests/regressiontests/initial_sql_regress/tests.py b/tests/regressiontests/initial_sql_regress/tests.py
index 815b75a9bb..03a91cb807 100644
--- a/tests/regressiontests/initial_sql_regress/tests.py
+++ b/tests/regressiontests/initial_sql_regress/tests.py
@@ -4,12 +4,26 @@ from .models import Simple
 
 
 class InitialSQLTests(TestCase):
-    def test_initial_sql(self):
-        # The format of the included SQL file for this test suite is important.
-        # It must end with a trailing newline in order to test the fix for #2161.
+    # The format of the included SQL file for this test suite is important.
+    # It must end with a trailing newline in order to test the fix for #2161.
 
-        # However, as pointed out by #14661, test data loaded by custom SQL
+    def test_initial_sql(self):
+        # As pointed out by #14661, test data loaded by custom SQL
         # can't be relied upon; as a result, the test framework flushes the
         # data contents before every test. This test validates that this has
         # occurred.
         self.assertEqual(Simple.objects.count(), 0)
+
+    def test_custom_sql(self):
+        from django.core.management.sql import custom_sql_for_model
+        from django.core.management.color import no_style
+        from django.db import connections, DEFAULT_DB_ALIAS
+
+        # Simulate the custom SQL loading by syncdb
+        connection = connections[DEFAULT_DB_ALIAS]
+        custom_sql = custom_sql_for_model(Simple, no_style(), connection)
+        self.assertEqual(len(custom_sql), 8)
+        cursor = connection.cursor()
+        for sql in custom_sql:
+            cursor.execute(sql)
+        self.assertEqual(Simple.objects.count(), 8)