Ticket #6074: 6074.diff

a/django/db/models/query.py

@@ -715 +715 @@
-    def get_sql(self, opts):
-        joins, where, params = SortedDict(), [], []
-        for val in self.args:
-
-
-
-
-
-
-
-
+
+
+
+
-        if where:
-            return joins, ['(%s)' % self.operator.join(where)], params
-        return joins, [], params
@@ -743 +739 @@
-
-class QOr(QOperator):
-    "Encapsulates a combined query that uses 'OR'."
+    def get_sql(self, opts):
+        joins, where, params = SortedDict(), [], []
+        failed = 0
+        for val in self.args:
+            try:
+                joins2, where2, params2 = val.get_sql(opts)
+                joins.update(joins2)
+                where.extend(where2)
+                params.extend(params2)
+            except EmptyResultSet:
+                failed += 1
+        if failed == len( self.args ):
+            raise EmptyResultSet
+
+        if where:
+            return joins, ['(%s)' % self.operator.join(where)], params
+        return joins, [], params
-    operator = ' OR '
-    def __and__(self, other):
-        return QAnd(self, other)

a/tests/modeltests/or_lookups/models.py

@@ -116 +116 @@
-[<Article: Hello>]
->>> Article.objects.complex_filter(Q(pk=1) | Q(pk=2))
-[<Article: Hello>, <Article: Goodbye>]
+
+# Check that Q(id__in=[]) returns the same results as Q(id__in=[]) | Q(id__in=[]) when used with filter : 
+>>> Article.objects.filter(Q(id__in=[]) | Q(id__in=[])) 
+[]
+>>> Article.objects.filter(Q(id__in=[]) | Q(id=1) |Q(id__in=[])) 
+[<Article: Hello>]
-"""}