Ticket #1803: union_set.diff

django/db/models/query.py

@@ -140 +140 @@
         combined._filters = self._filters & other._filters
         return combined
 
+    # add set-like intersection, it is only an alias for __and__
+    intersection = __and__
+
     def __or__(self, other):
         combined = self._combine(other)
         combined._filters = self._filters | other._filters
         return combined
+
+    # add set-like union, it is only an alias for __or__
+    union = __or__
 
     ####################################
     # METHODS THAT DO DATABASE QUERIES #
@@ -302 +308 @@
 
     def complex_filter(self, filter_obj):
         """Returns a new QuerySet instance with filter_obj added to the filters.
-        filter_obj can be a Q object (has 'get_sql' method) or a dictionary of 
+        filter_obj can be a Q object (has 'get_sql' method) or a dictionary of
         keyword lookup arguments."""
         # This exists to support framework features such as 'limit_choices_to',
         # and usually it will be more natural to use other methods.

tests/modeltests/or_lookups/models.py

@@ -1 +1 @@
 """
 19. OR lookups
 
-To perform an OR lookup, or a lookup that combines ANDs and ORs, 
+To perform an OR lookup, or a lookup that combines ANDs and ORs,
 combine QuerySet objects using & and | operators.
 
-Alternatively, use positional arguments, and pass one or more expressions 
+Alternatively, use positional arguments, and pass one or more expressions
 of clauses using the variable ``django.db.models.Q`` (or any object with
 a get_sql method).
 
@@ -38 +38 @@
 >>> Article.objects.filter(headline__startswith='Hello') |  Article.objects.filter(headline__startswith='Goodbye')
 [Hello, Goodbye, Hello and goodbye]
 
+>>> Article.objects.filter(headline__startswith='Hello').union(Article.objects.filter(headline__startswith='Goodbye'))
+[Hello, Goodbye, Hello and goodbye]
+
 >>> Article.objects.filter(Q(headline__startswith='Hello') | Q(headline__startswith='Goodbye'))
 [Hello, Goodbye, Hello and goodbye]
 
@@ -45 +48 @@
 []
 
 >>> Article.objects.filter(headline__startswith='Hello') & Article.objects.filter(headline__startswith='Goodbye')
+[]
+
+>>> Article.objects.filter(headline__startswith='Hello').intersection(Article.objects.filter(headline__startswith='Goodbye'))
 []
 
 >>> Article.objects.filter(headline__startswith='Hello') & Article.objects.filter(headline__contains='bye')
@@ -65 +71 @@
 >>> Article.objects.filter(Q(pk=1) | Q(pk=2) | Q(pk=3))
 [Hello, Goodbye, Hello and goodbye]
 
-# Q arg objects are ANDed 
+# Q arg objects are ANDed
 >>> Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye'))
 [Hello and goodbye]
 
@@ -86 +92 @@
 >>> Article.objects.filter(Q(headline__startswith='Hello')).in_bulk([1,2])
 {1: Hello}
 
-# The 'complex_filter' method supports framework features such as 
+# The 'complex_filter' method supports framework features such as
 # 'limit_choices_to' which normally take a single dictionary of lookup arguments
 # but need to support arbitrary queries via Q objects too.
 >>> Article.objects.complex_filter({'pk': 1})