Ticket #7907: 7907_2.diff

django/db/models/sql/compiler.py

@@ -449 +449 @@
                 result.append('%s%s%s' % (connector, qn(name), alias_str))
             first = False
         for t in self.query.extra_tables:
+            if isinstance(t, tuple):
+                t, subselect = t
+            else:
+                subselect = None
             alias, unused = self.query.table_alias(t)
             # Only add the alias if it's not already present (the table_alias()
             # calls increments the refcount, so an alias refcount of one means
             # this is the only reference.
             if alias not in self.query.alias_map or self.query.alias_refcount[alias] == 1:
                 connector = not first and ', ' or ''
-                result.append('%s%s' % (connector, qn(alias)))
+                if subselect is None:
+                    result.append('%s%s' % (connector, qn(alias)))
+                else:
+                    result.append('%s%s as %s' % (connector, subselect, qn(alias)))
                 first = False
         return result, []
 

django/db/models/sql/query.py

@@ -1637 +1637 @@
         if where or params:
             self.where.add(ExtraWhere(where, params), AND)
         if tables:
-            self.extra_tables += tuple(tables)
+            # allow tables to be dictionaries mapping names to subselects
+            if hasattr(tables, 'items'):
+                self.extra_tables += tuple(tables.items())
+            else:
+                self.extra_tables += tuple(tables)
         if order_by:
             self.extra_order_by = order_by