mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.11.x] Fixed #28293 -- Fixed union(), intersection(), and difference() when combining with an EmptyQuerySet.

Browse Source 
Thanks Jon Dufresne for the report and Tim Graham for the review.

Backport of 82175ead72 from master
This commit is contained in:
Mariusz Felisiak
2017-06-13 08:16:16 +02:00
parent 927d9b51fe
commit 44e29ea1e9
4 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/queries/test_qs_combinators.py
View File

@@ -45,6 +45,31 @@ class QuerySetSetOperationTests(TestCase):
self.assertEqual(len(list(qs1.union(qs2, all=True))), 20)
self.assertEqual(len(list(qs1.union(qs2))), 10)
@skipUnlessDBFeature('supports_select_intersection')
def test_intersection_with_empty_qs(self):
qs1 = Number.objects.all()
qs2 = Number.objects.none()
self.assertEqual(len(qs1.intersection(qs2)), 0)
self.assertEqual(len(qs2.intersection(qs1)), 0)
self.assertEqual(len(qs2.intersection(qs2)), 0)
@skipUnlessDBFeature('supports_select_difference')
def test_difference_with_empty_qs(self):
qs1 = Number.objects.all()
qs2 = Number.objects.none()
self.assertEqual(len(qs1.difference(qs2)), 10)
self.assertEqual(len(qs2.difference(qs1)), 0)
self.assertEqual(len(qs2.difference(qs2)), 0)
def test_union_with_empty_qs(self):
qs1 = Number.objects.all()
qs2 = Number.objects.none()
self.assertEqual(len(qs1.union(qs2)), 10)
self.assertEqual(len(qs2.union(qs1)), 10)
self.assertEqual(len(qs2.union(qs1, qs1, qs1)), 10)
self.assertEqual(len(qs2.union(qs1, qs1, all=True)), 20)
self.assertEqual(len(qs2.union(qs2)), 0)
def test_union_bad_kwarg(self):
qs1 = Number.objects.all()
msg = "union() received an unexpected keyword argument 'bad'"