Fixed #26192 -- Fixed crash of ordering by constants on PostgreSQL.

Thanks Simon Charette for the review.
This commit is contained in:
Mariusz Felisiak 2019-05-21 20:10:24 +02:00
parent cc80979f01
commit f6075fb333
2 changed files with 33 additions and 8 deletions

View File

@ -5,7 +5,8 @@ from itertools import chain
from django.core.exceptions import EmptyResultSet, FieldError from django.core.exceptions import EmptyResultSet, FieldError
from django.db.models.constants import LOOKUP_SEP from django.db.models.constants import LOOKUP_SEP
from django.db.models.expressions import OrderBy, Random, RawSQL, Ref from django.db.models.expressions import OrderBy, Random, RawSQL, Ref, Value
from django.db.models.functions import Cast
from django.db.models.query_utils import QueryWrapper, select_related_descend from django.db.models.query_utils import QueryWrapper, select_related_descend
from django.db.models.sql.constants import ( from django.db.models.sql.constants import (
CURSOR, GET_ITERATOR_CHUNK_SIZE, MULTI, NO_RESULTS, ORDER_DIR, SINGLE, CURSOR, GET_ITERATOR_CHUNK_SIZE, MULTI, NO_RESULTS, ORDER_DIR, SINGLE,
@ -278,6 +279,9 @@ class SQLCompiler:
order_by = [] order_by = []
for field in ordering: for field in ordering:
if hasattr(field, 'resolve_expression'): if hasattr(field, 'resolve_expression'):
if isinstance(field, Value):
# output_field must be resolved for constants.
field = Cast(field, field.output_field)
if not isinstance(field, OrderBy): if not isinstance(field, OrderBy):
field = field.asc() field = field.asc()
if not self.query.standard_ordering: if not self.query.standard_ordering:
@ -299,10 +303,13 @@ class SQLCompiler:
True)) True))
continue continue
if col in self.query.annotations: if col in self.query.annotations:
# References to an expression which is masked out of the SELECT clause # References to an expression which is masked out of the SELECT
order_by.append(( # clause.
OrderBy(self.query.annotations[col], descending=descending), expr = self.query.annotations[col]
False)) if isinstance(expr, Value):
# output_field must be resolved for constants.
expr = Cast(expr, expr.output_field)
order_by.append((OrderBy(expr, descending=descending), False))
continue continue
if '.' in field: if '.' in field:

View File

@ -405,17 +405,35 @@ class OrderingTests(TestCase):
attrgetter("headline") attrgetter("headline")
) )
def test_order_by_annotated_constant_value(self): def test_order_by_constant_value(self):
# Order by annotated constant from selected columns.
qs = Article.objects.annotate( qs = Article.objects.annotate(
constant=Value('1', output_field=CharField()), constant=Value('1', output_field=CharField()),
).order_by('constant', '-headline') ).order_by('constant', '-headline')
self.assertSequenceEqual(qs, [self.a4, self.a3, self.a2, self.a1]) self.assertSequenceEqual(qs, [self.a4, self.a3, self.a2, self.a1])
# Order by annotated constant which is out of selected columns.
self.assertSequenceEqual(
qs.values_list('headline', flat=True), [
'Article 4',
'Article 3',
'Article 2',
'Article 1',
],
)
# Order by constant.
qs = Article.objects.order_by(Value('1', output_field=CharField()), '-headline')
self.assertSequenceEqual(qs, [self.a4, self.a3, self.a2, self.a1])
def test_order_by_constant_value_without_output_field(self): def test_order_by_constant_value_without_output_field(self):
msg = 'Cannot resolve expression type, unknown output_field' msg = 'Cannot resolve expression type, unknown output_field'
qs = Article.objects.annotate(constant=Value('1')).order_by('constant') qs = Article.objects.annotate(constant=Value('1')).order_by('constant')
with self.assertRaisesMessage(FieldError, msg): for ordered_qs in (
qs.first() qs,
qs.values('headline'),
Article.objects.order_by(Value('1')),
):
with self.subTest(ordered_qs=ordered_qs), self.assertRaisesMessage(FieldError, msg):
ordered_qs.first()
def test_related_ordering_duplicate_table_reference(self): def test_related_ordering_duplicate_table_reference(self):
""" """