2 files changed, 29 insertions, 9 deletions
diff --git a/tests/initial_sql_regress/sql/simple.sql b/tests/initial_sql_regress/sql/simple.sql
index d82f8381af..c3edb11c5a 100644
--- a/tests/initial_sql_regress/sql/simple.sql
+++ b/tests/initial_sql_regress/sql/simple.sql
@@ -7,5 +7,6 @@ INSERT INTO
 INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Semicolon;Man');
+INSERT INTO initial_sql_regress_simple (name) VALUES ('"100%" of % are not placeholders');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('This line has a Windows line ending');
 
diff --git a/tests/initial_sql_regress/tests.py b/tests/initial_sql_regress/tests.py
index 39d8921061..bd23aab15d 100644
--- a/tests/initial_sql_regress/tests.py
+++ b/tests/initial_sql_regress/tests.py
@@ -2,27 +2,46 @@ from django.core.management.color import no_style
 from django.core.management.sql import custom_sql_for_model
 from django.db import connections, DEFAULT_DB_ALIAS
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from .models import Simple
 
 
 class InitialSQLTests(TestCase):
-    # 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.
+    """
 
     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.
+        """
+        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):
-        # Simulate the custom SQL loading by syncdb
+        """
+        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)
+        self.assertEqual(len(custom_sql), 9)
         cursor = connection.cursor()
         for sql in custom_sql:
             cursor.execute(sql)
-        self.assertEqual(Simple.objects.count(), 8)
+        self.assertEqual(Simple.objects.count(), 9)
+        self.assertEqual(
+            Simple.objects.get(name__contains='placeholders').name,
+            '"100%" of % are not placeholders'
+        )
+
+    @override_settings(DEBUG=True)
+    def test_custom_sql_debug(self):
+        """
+        Same test, ensure that CursorDebugWrapper doesn't alter sql loading
+        (#3485).
+        """
+        self.test_custom_sql()