Ticket #13648: all_patches.patch

django/db/models/sql/query.py

@@ -1626 +1626 @@
                 entry_params = []
                 pos = entry.find("%s")
                 while pos != -1:
-                    entry_params.append(param_iter.next())
+                    # allow %s to be sent to the database, example calling strftime
+                    # from sqlite
+                    if entry.find("%%s", pos-1) != pos-1:
+                        entry_params.append(param_iter.next())
                     pos = entry.find("%s", pos + 2)
                 select_pairs[name] = (entry, entry_params)
             # This is order preserving, since self.extra_select is a SortedDict.

django/db/backends/sqlite3/base.py

@@ -207 +207 @@
         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

@@ -47 +47 @@
         self.assertEqual(long_str, row[0].read())
         c.execute('DROP TABLE ltext')
 
+
+class SQLiteCheckTest(unittest.TestCase):
+
+    def setUp(self):
+        # Creates the SchoolClass
+        person = models.Person.objects.create(first_name='Django',
+                                                   last_name='Sprint')
+
+
+    def test_regression_13648(self):
+        """
+        Test %%s scapping for sqlite3 - see #12268__ and #13648__
+
+        __: http://code.djangoproject.com/ticket/12268
+        __: http://code.djangoproject.com/ticket/13648
+
+        """
+        self.assertTrue(len(models.Person.objects.all()), 1)
+        qs = models.Person.objects.extra(
+                select={'extra': "strftime(\"%%s\", '2010-11-13', 'utc')"},
+                )
+        p = qs.get()
+        self.assertEquals(int(p.extra), 1289617200)
+
 class DateQuotingTest(TestCase):
 
     def test_django_date_trunc(self):