From b86bb47818e159e8db7e524ed8ef055b569ea111 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Mon, 14 Jan 2019 20:28:11 +0500 Subject: Fixed #30093 -- Fixed ordering of combined queryset ordered by F expressions. --- tests/queries/test_qs_combinators.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/queries/test_qs_combinators.py b/tests/queries/test_qs_combinators.py index 8a928ba91f..3902db59e2 100644 --- a/tests/queries/test_qs_combinators.py +++ b/tests/queries/test_qs_combinators.py @@ -110,6 +110,11 @@ class QuerySetSetOperationTests(TestCase): qs2 = Number.objects.filter(num__gte=2, num__lte=3) self.assertNumbersEqual(qs1.union(qs2).order_by('-num'), [3, 2, 1, 0]) + def test_ordering_by_f_expression(self): + qs1 = Number.objects.filter(num__lte=1) + qs2 = Number.objects.filter(num__gte=2, num__lte=3) + self.assertNumbersEqual(qs1.union(qs2).order_by(F('num').desc()), [3, 2, 1, 0]) + def test_union_with_values(self): ReservedName.objects.create(name='a', order=2) qs1 = ReservedName.objects.all() -- cgit v1.3