Ticket #11916: ticket_11916.3.diff

django/db/models/sql/compiler.py

@@ -484 +484 @@
                 elif hasattr(col, 'as_sql'):
                     result.append(col.as_sql(qn))
                 else:
-                    result.append(str(col))
+                    result.append('(%s)' % str(col))
         return result, params
 
     def fill_related_selections(self, opts=None, root_alias=None, cur_depth=1,

tests/regressiontests/aggregation_regress/tests.py

@@ +1 @@
+from django.conf import settings
 from django.test import TestCase
-from django.db.models import Max
+from django.db import DEFAULT_DB_ALIAS
+from django.db.models import Count, Max
 
 from regressiontests.aggregation_regress.models import *
 
@@ -46 +48 @@
         qs1 = books.filter(id__in=qs)
         qs2 = books.filter(id__in=list(qs))
         self.assertEqual(list(qs1), list(qs2))
+
+    def test_annotate_with_extra(self):
+        """
+        Regression test for #11916: Extra params + aggregation creates
+        incorrect SQL.
+        """
+        #oracle doesn't support subqueries in group by clause
+        if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.oracle':
+            return
+        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)