Changeset 7426

Timestamp:

04/15/08 21:58:00 (3 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Querysets no longer need to be customised per-backend.
Instead, it's the Query class that is backend-dependent. So make that explicit
in the code (code should refer to sql.Query and they will always get the right
backend-specific class).

This also fixes the main part of #6956, in that the various subclasses of Query
automatically use any custom Query class.

Fixed #6956.

Files:

• django/branches/queryset-refactor/django/db/models/query.py (modified) (2 diffs)
• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (2 diffs)

django/branches/queryset-refactor/django/db/models/query.py

@@ -17 +17 @@
-EmptyResultSet = sql.EmptyResultSet
-
-_
+
-    "Represents a lazy database lookup for a set of objects"
-    def __init__(self, model=None, query=None):
@@ -479 +479 @@
-                    % (self.__class__.__name__, other.__class__.__name__))
-
-# Use the backend's QuerySet class if it defines one. Otherwise, use _QuerySet.
-if connection.features.uses_custom_queryset:
-    QuerySet = connection.ops.query_set_class(_QuerySet)
-else:
-    QuerySet = _QuerySet
-
-class ValuesQuerySet(QuerySet):
-    def __init__(self, *args, **kwargs):

django/branches/queryset-refactor/django/db/models/sql/query.py

@@ -14 +14 @@
-from django.utils.datastructures import SortedDict
-from django.dispatch import dispatcher
+from django.db import connection
-from django.db.models import signals
-from django.db.models.sql.where import WhereNode, EverythingNode, AND, OR
@@ -1372 +1373 @@
-                self.connection.features.empty_fetchmany_value)
-
+# 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)
+
-def get_order_dir(field, default='ASC'):
-    """