Ticket #11916: ticket_11916.2.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/models.py

@@ -318 +318 @@
 ...
 FieldError: Cannot compute Avg('mean_age'): 'mean_age' is an aggregate
 
+# Regression 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
+>>> Publisher.objects.extra(select={
+...     'name_of_shortest_book': shortest_book_sql,
+... }).annotate(total_books=Count('book')).order_by('name').values_list('id', 'total_books', 'name_of_shortest_book')
+[(1, 2, u'Practical Django Projects'), (5, 0, None), (4, 1, u'Paradigms of Artificial Intelligence Programming: Case Studies in Common Lisp'), (3, 2, u'Python Web Development with Django'), (2, 1, u'Sams Teach Yourself Django in 24 Hours')]
 """
 }