Fixed #34372 -- Fixed queryset crash on order by aggregation using Or…

…derBy.

Regression in 278881e caused by a lack
of expression copying when an OrderBy expression is explicitly provided.

Thanks Jannis Vajen for the report and regression test.

django/db/models/sql/compiler.py

@@ -358,11 +358,13 @@ def _order_by_pairs(self):
                     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

tests/ordering/tests.py

@@ -638,3 +638,9 @@ def test_ordering_select_related_collision(self):
             .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())