Ticket #11916: ticket_11916.diff

django/db/models/sql/compiler.py

@@ -473 +473 @@
             group_by = self.query.group_by or []
 
             extra_selects = []
-            for extra_select, extra_params in self.query.extra_select.itervalues():
-                extra_selects.append(extra_select)
-                params.extend(extra_params)
+            for extra_select_key in self.query.extra_select.iterkeys():
+                extra_selects.append(extra_select_key)
             for col in group_by + self.query.related_select_cols + extra_selects:
                 if isinstance(col, (list, tuple)):
                     result.append('%s.%s' % (qn(col[0]), qn(col[1])))

new file tests/regressiontests/aggregation_regress/tests.py

@@ +1 @@
+from django.test import TestCase
+from django.db.models import Count
+
+from regressiontests.aggregation_regress.models import *
+
+
+class AggregationTests(TestCase):
+    
+    def test_annotate_with_extra(self):
+        """
+        Regression test for #11916: Extra params + aggregation creates
+        incorrect SQL.
+        """
+        shortest_book_sql = """
+        SELECT name 
+        FROM aggregation_regress_book b
+        WHERE b.publisher_id = aggregation_regress_publisher.id
+        ORDER BY b.pages
+        LIMIT 1
+        """
+        # tests that this query does not raise a DatabaseError due to the full
+        # subselect being (erroneously) added to the GROUP BY parameters
+        qs = Publisher.objects.extra(select={
+            'name_of_shortest_book': shortest_book_sql,
+        }).annotate(total_books=Count('book'))
+        # force execution of the query
+        list(qs)