Ticket #11916: compiler.diff

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])))