Field position reference for aggregate ends up in group-by clause

[Jannis Vajen]

Changeset 278881e37619278789942513916acafaa88d26f3 introduced a regression. Aggregate queries are rejected by the database due to the aggregated field being added to the GROUP BY clause.

It was difficult for me to pin down, especially because it looks like the error only occurs on the second evaluation of the query. The first query is executed just fine and doesn't contain the position reference to the aggregated field in the GROUP BY, only the second one. Below is a test to reproduce the behaviour:

tests/aggregation_regress/tests.py

@@ -1321 +1321 @@
             lambda b: (b.name, b.authorCount),
         )
 
+    def test_quoting_aggregate_order_by_f(self):
+        author = Author.objects.get(name="Peter Norvig")
+        qs = (
+            author.book_set.all()
+            .annotate(num=Count("authors"))
+            .order_by(F("num").desc())
+        )
+        list(qs.iterator())
+        list(qs.iterator())
+
     def test_stddev(self):
         self.assertEqual(
             Book.objects.aggregate(StdDev("pages")),

[Simon Charette]

Thanks a lot for the report and the test Jannis, pretty sure this due to a lack of field.copy() 278881e37619278789942513916acafaa88d26f3 if this only happens on query re-evaluation.

[GitHub <noreply@…>]

In b15f162:

Fixed #34372 -- Fixed queryset crash on order by aggregation using OrderBy.

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

Thanks Jannis Vajen for the report and regression test.

[Mariusz Felisiak <felisiak.mariusz@…>]

In 872dade:

[4.2.x] Fixed #34372 -- Fixed queryset crash on order by aggregation using OrderBy.

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

Thanks Jannis Vajen for the report and regression test.
Backport of b15f162f252610e3b510ade465549769ab4356cf from main