From 616f468760e4984915bb2ccca6b9eb3d80ddadb0 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sun, 26 Nov 2017 17:32:17 +0100 Subject: Fixed #28848 -- Fixed SQLite/MySQL crash when ordering by a filtered subquery that uses nulls_first/nulls_last. --- tests/ordering/tests.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'tests/ordering') diff --git a/tests/ordering/tests.py b/tests/ordering/tests.py index 07c319b4c3..8c07a27428 100644 --- a/tests/ordering/tests.py +++ b/tests/ordering/tests.py @@ -1,7 +1,7 @@ from datetime import datetime from operator import attrgetter -from django.db.models import F +from django.db.models import DateTimeField, F, Max, OuterRef, Subquery from django.db.models.functions import Upper from django.test import TestCase @@ -138,6 +138,27 @@ class OrderingTests(TestCase): [self.a1, self.a2, self.a4, self.a3], ) + def test_orders_nulls_first_on_filtered_subquery(self): + Article.objects.filter(headline='Article 1').update(author=self.author_1) + Article.objects.filter(headline='Article 2').update(author=self.author_1) + Article.objects.filter(headline='Article 4').update(author=self.author_2) + Author.objects.filter(name__isnull=True).delete() + author_3 = Author.objects.create(name='Name 3') + article_subquery = Article.objects.filter( + author=OuterRef('pk'), + headline__icontains='Article', + ).order_by().values('author').annotate( + last_date=Max('pub_date'), + ).values('last_date') + self.assertQuerysetEqualReversible( + Author.objects.annotate( + last_date=Subquery(article_subquery, output_field=DateTimeField()) + ).order_by( + F('last_date').asc(nulls_first=True) + ).distinct(), + [author_3, self.author_1, self.author_2], + ) + def test_stop_slicing(self): """ Use the 'stop' part of slicing notation to limit the results. -- cgit v1.2.1