Commit f764d7ff authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #11483 -- Modified db cache backend to use db backend functions... 

[1.1.X] Fixed #11483 -- Modified db cache backend to use db backend functions for date conversion, avoiding problems under Jython. Thanks to Leo Soto for the report and patch.

Merge of r12411 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d4a34b55

django/core/cache/backends/db.py

+6 −3
Original line number Diff line number Diff line
@@ -60,9 +60,11 @@ class CacheClass(BaseCache): 
            result = cursor.fetchone()

            if result and (mode == 'set' or

                    (mode == 'add' and result[1] < now)):

                cursor.execute("UPDATE %s SET value = %%s, expires = %%s WHERE cache_key = %%s" % self._table, [encoded, str(exp), key])

                cursor.execute("UPDATE %s SET value = %%s, expires = %%s WHERE cache_key = %%s" % self._table,

                               [encoded, connection.ops.value_to_db_datetime(exp), key])

            else:

                cursor.execute("INSERT INTO %s (cache_key, value, expires) VALUES (%%s, %%s, %%s)" % self._table, [key, encoded, str(exp)])

                cursor.execute("INSERT INTO %s (cache_key, value, expires) VALUES (%%s, %%s, %%s)" % self._table,

                               [key, encoded, connection.ops.value_to_db_datetime(exp)])

        except DatabaseError:

            # To be threadsafe, updates/inserts are allowed to fail silently

            transaction.rollback_unless_managed()
@@ -86,7 +88,8 @@ class CacheClass(BaseCache): 
        if self._cull_frequency == 0:

            cursor.execute("DELETE FROM %s" % self._table)

        else:

            cursor.execute("DELETE FROM %s WHERE expires < %%s" % self._table, [str(now)])

            cursor.execute("DELETE FROM %s WHERE expires < %%s" % self._table,

                           [connection.ops.value_to_db_datetime(now)])

            cursor.execute("SELECT COUNT(*) FROM %s" % self._table)

            num = cursor.fetchone()[0]

            if num > self._max_entries:

tests/regressiontests/cache/tests.py

+0 −4
Original line number Diff line number Diff line
@@ -290,10 +290,6 @@ class BaseCacheTests(object): 
        self.cache.add('key2', 'ham', 60*60*24*30 + 1)

        self.assertEqual(self.cache.get('key2'), 'ham')



        self.cache.set_many({'key3': 'sausage', 'key4': 'lobster bisque'}, 60*60*24*30 + 1)

        self.assertEqual(self.cache.get('key3'), 'sausage')

        self.assertEqual(self.cache.get('key4'), 'lobster bisque')



class DBCacheTests(unittest.TestCase, BaseCacheTests):

    def setUp(self):

        # Spaces are used in the table name to ensure quoting/escaping is working