Changeset 7342

Timestamp:

03/21/08 05:59:25 (5 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Added some sanity checking to and() and or() because
some people insist on trying to merge a Queryset and a ValuesQuerySet?.

Files:

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

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

@@ -119 +119 @@
-            raise IndexError, e.args
-
+    def _merge_sanity_check(self, other):
+        """
+        Checks that we are merging two comparable queyrset classes.
+        """
+        if self.__class__ is not other.__class__:
+            raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."
+                    % (self.__class__.__name__, other.__class__.__name__))
+
-    def __and__(self, other):
+        self._merge_sanity_check(other)
-        combined = self._clone()
-        combined.query.combine(other.query, sql.AND)
@@ -125 +134 @@
-
-    def __or__(self, other):
+        self._merge_sanity_check(other)
-        combined = self._clone()
-        combined.query.combine(other.query, sql.OR)
@@ -528 +538 @@
-        return c
-
+    def _merge_sanity_check(self, other):
+        super(ValuesQuerySet, self)._merge_sanity_check(other)
+        if (set(self.extra_names) != set(other.extra_names) or
+                set(self.field_names) != set(other.field_names)):
+            raise TypeError("Merging '%s' classes must involve the same values in each case."
+                    % self.__class__.__name__)
+
-class ValuesListQuerySet(ValuesQuerySet):
-    def iterator(self):