Ticket #15155: fix-15155.patch

django/db/backends/sqlite3/base.py

@@ -186 +186 @@
         if self.settings_dict['NAME'] != ":memory:":
             BaseDatabaseWrapper.close(self)
 
-FORMAT_QMARK_REGEX = re.compile(r'(?![^%])%s')
+FORMAT_QMARK_REGEX = re.compile(r'(?<!%)%s')
 
 class SQLiteCursorWrapper(Database.Cursor):
     """

tests/regressiontests/backends/tests.py

@@ -206 +206 @@
         self.assertEqual(cursor.fetchone(), (u'Clark', u'Kent'))
         self.assertEqual(list(cursor.fetchmany(2)), [(u'Jane', u'Doe'), (u'John', u'Doe')])
         self.assertEqual(list(cursor.fetchall()), [(u'Mary', u'Agnelline'), (u'Peter', u'Parker')])
+
+if settings.DATABASES[DEFAULT_DB_ALIAS]["ENGINE"] == "django.db.backends.sqlite3":
+    class EscapingChecks(unittest.TestCase):
+
+        def test_parameter_escaping(self):
+            # ticket #15155
+            cursor = connection.cursor()
+            response = cursor.execute("select strftime('%%s', date('now'))").fetchall()[0][0]
+            self.assertNotEqual(response, None)