Changeset 7765

Timestamp:

06/26/08 06:42:12 (5 months ago)

Author:

mtredinnick

Message:

EmptyQuerySet? classes can now be merged with normal querysets.

Files:

• django/trunk/django/db/models/query.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)

django/trunk/django/db/models/query.py

@@ -219 +219 @@
-    def __and__(self, other):
-        self._merge_sanity_check(other)
+        if isinstance(other, EmptyQuerySet):
+            return other._clone()
-        combined = self._clone()
-        combined.query.combine(other.query, sql.AND)
@@ -226 +228 @@
-        self._merge_sanity_check(other)
-        combined = self._clone()
+        if isinstance(other, EmptyQuerySet):
+            return combined
-        combined.query.combine(other.query, sql.OR)
-        return combined
@@ -706 +710 @@
-        self._result_cache = []
-
+    def __and__(self, other):
+        return self._clone()
+
+    def __or__(self, other):
+        return other._clone()
+
-    def count(self):
-        return 0

django/trunk/tests/regressiontests/queries/models.py

@@ -782 +782 @@
-[]
-
+Empty querysets can be merged with others.
+>>> Note.objects.none() | Note.objects.all()
+[<Note: n1>, <Note: n2>, <Note: n3>]
+>>> Note.objects.all() | Note.objects.none()
+[<Note: n1>, <Note: n2>, <Note: n3>]
+>>> Note.objects.none() & Note.objects.all()
+[]
+>>> Note.objects.all() & Note.objects.none()
+[]
+
-"""}
-