Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added regression test for custom SQL containing percents

Refs #3485.
  • Loading branch information...
commit 34a50e99e80295aa0a8970a775f53c62fe220c5a 1 parent f2a0be6
@claudep claudep authored
View
1  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');
View
37 tests/initial_sql_regress/tests.py
@@ -2,27 +2,46 @@
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()
Please sign in to comment.
Something went wrong with that request. Please try again.