Ticket #6074: patch.diff

django/db/models/query.py

@@ -714 +714 @@
-
-    def get_sql(self, opts):
-        joins, where, params = SortedDict(), [], []
-
+[:-1]
-            try:
-                joins2, where2, params2 = val.get_sql(opts)
-                joins.update(joins2)
-                where.extend(where2)
-                params.extend(params2)
-            except EmptyResultSet:
- isinstance(self, QOr
+(isinstance(self, QOr)
-                    raise EmptyResultSet
+        joins2, where2, params2 = self.args[-1].get_sql(opts)
+        joins.update(joins2)
+        where.extend(where2)
+        params.extend(params2)
-        if where:
-            return joins, ['(%s)' % self.operator.join(where)], params
-        return joins, [], params

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=[]))
+[]
-"""}