Ticket #10290: 10290.diff

django/db/models/sql/query.py

@@ -703 +703 @@
         result = []
         if self.group_by is not None:
             group_by = self.group_by or []
-            for col in group_by + self.related_select_cols + self.extra_select.keys():
+            extra_selects = [v[0] for v in self.extra_select.itervalues()]
+            for col in group_by + self.related_select_cols + extra_selects:
                 if isinstance(col, (list, tuple)):
                     result.append('%s.%s' % (qn(col[0]), qn(col[1])))
                 elif hasattr(col, 'as_sql'):
@@ -791 +792 @@
                 if distinct and col not in select_aliases:
                     ordering_aliases.append(elt)
                 result.append('%s %s' % (elt, order))
-                group_by.append(elt)
+                group_by.append(self.extra_select[col][0])
         self.ordering_aliases = ordering_aliases
         return result, group_by