mirror of https://github.com/django/django.git
Fixed #34372 -- Fixed queryset crash on order by aggregation using OrderBy.
Regression in 278881e376
caused by a lack
of expression copying when an OrderBy expression is explicitly provided.
Thanks Jannis Vajen for the report and regression test.
This commit is contained in:
parent
2276ec8c21
commit
b15f162f25
|
@ -358,11 +358,13 @@ class SQLCompiler:
|
|||
if (
|
||||
field.nulls_first is None and field.nulls_last is None
|
||||
) or self.connection.features.supports_order_by_nulls_modifier:
|
||||
field = field.copy()
|
||||
field.expression = select_ref
|
||||
# Alias collisions are not possible when dealing with
|
||||
# combined queries so fallback to it if emulation of NULLS
|
||||
# handling is required.
|
||||
elif self.query.combinator:
|
||||
field = field.copy()
|
||||
field.expression = Ref(select_ref.refs, select_ref.source)
|
||||
yield field, select_ref is not None
|
||||
continue
|
||||
|
|
|
@ -638,3 +638,9 @@ class OrderingTests(TestCase):
|
|||
.first(),
|
||||
self.a1,
|
||||
)
|
||||
|
||||
def test_order_by_expr_query_reuse(self):
|
||||
qs = Author.objects.annotate(num=Count("article")).order_by(
|
||||
F("num").desc(), "pk"
|
||||
)
|
||||
self.assertCountEqual(qs, qs.iterator())
|
||||
|
|
Loading…
Reference in New Issue