summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-04-02 14:44:16 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-04-02 14:44:16 +0000
commit8f8743a69ede47743e1aa6ab83295e35fcfd96cf (patch)
treee743b73fd012ed864c8b7d7e0a5297265882c7b5 /django/db/models/sql
parent7d5c7df6a943b5659831e4f38546798c7bd541c0 (diff)
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
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py15
1 files changed, 15 insertions, 0 deletions
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()