Commit 0eac35ce authored by Ian Kelly's avatar Ian Kelly
Browse files

[1.0.X] Fixed #10488: fixed DB cache backend test failures in Oracle. Backport... 

[1.0.X] Fixed #10488: fixed DB cache backend test failures in Oracle. Backport of [10051] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 0ced9f68

django/core/cache/backends/db.py

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ class CacheClass(BaseCache): 
            cursor.execute("DELETE FROM %s WHERE cache_key = %%s" % self._table, [key])

            transaction.commit_unless_managed()

            return default

        return pickle.loads(base64.decodestring(row[1]))

        value = connection.ops.process_clob(row[1])

        return pickle.loads(base64.decodestring(value))



    def set(self, key, value, timeout=None):

        self._base_set('set', key, value, timeout)

django/db/backends/__init__.py

+7 −0
Original line number Diff line number Diff line
@@ -212,6 +212,13 @@ class BaseDatabaseOperations(object): 
        """

        return 'DEFAULT'



    def process_clob(self, value):

        """

        Returns the value of a CLOB column, for backends that return a locator

        object that requires additional processing.

        """

        return value



    def query_class(self, DefaultQueryClass):

        """

        Given the default Query class, returns a custom Query class

django/db/backends/oracle/base.py

+5 −0
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ WHEN (new.%(col_name)s IS NULL) 
    def prep_for_iexact_query(self, x):

        return x



    def process_clob(self, value):

        if value is None:

            return u''

        return force_unicode(value.read())



    def query_class(self, DefaultQueryClass):

        return query.query_class(DefaultQueryClass, Database)