From 8f8743a69ede47743e1aa6ab83295e35fcfd96cf Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 2 Apr 2010 14:44:16 +0000 Subject: [PATCH] Fixed #12429 -- Modified RawQuery to provide some facilities required by Oracle. Thanks to Karen Tracey for the testing help. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12907 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 72d4bc9c1b..dc455763be 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -37,9 +37,24 @@ class RawQuery(object): self.using = using self.cursor = None + # Mirror some properties of a normal query so that + # the compiler can be used to process results. + self.low_mark, self.high_mark = 0, None # Used for offset/limit + self.extra_select = {} + self.aggregate_select = {} + def clone(self, using): return RawQuery(self.sql, using, params=self.params) + def convert_values(self, value, field, connection): + """Convert the database-returned value into a type that is consistent + across database backends. + + By default, this defers to the underlying backend operations, but + it can be overridden by Query classes for specific backends. + """ + return connection.ops.convert_values(value, field) + def get_columns(self): if self.cursor is None: self._execute_query()