summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-24 09:36:22 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-24 09:36:22 +0000
commit3dfbaae32b2e87fd1f47b569f973fb3f76602137 (patch)
tree189211d528c587efd887f9ccc1606385c7aabc57 /django/db/models/sql
parent03fcf19fd2043fe096d8ac63abb3fd7e533b639a (diff)
Fixed #9307 -- Added the ability to pickle the Query class used by the Oracle
backend. This allows Querysets to be cached for Oracle and should provide a model for adding pickling support to other (external) database backends that need a custom Query class. Thanks to Justin Bronn for some assistance with this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index ee63a0214f..3381b602b4 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -27,9 +27,9 @@ try:
except NameError:
from sets import Set as set # Python 2.3 fallback
-__all__ = ['Query']
+__all__ = ['Query', 'BaseQuery']
-class Query(object):
+class BaseQuery(object):
"""
A single SQL query.
"""
@@ -1757,7 +1757,9 @@ class Query(object):
# Use the backend's custom Query class if it defines one. Otherwise, use the
# default.
if connection.features.uses_custom_query_class:
- Query = connection.ops.query_class(Query)
+ Query = connection.ops.query_class(BaseQuery)
+else:
+ Query = BaseQuery
def get_order_dir(field, default='ASC'):
"""