Ticket #7231: extra-join-1.1b.2.diff

django/db/models/sql/query.py

@@ -93 +93 @@
         self.extra_where = ()
         self.extra_params = ()
         self.extra_order_by = ()
+        self.extra_join_123 = ()
 
         # A tuple that is a set of model field names and either True, if these
         # are the fields to defer, or False if these are the only fields to
@@ -211 +212 @@
         obj.extra_where = self.extra_where
         obj.extra_params = self.extra_params
         obj.extra_order_by = self.extra_order_by
+        obj.extra_join_123 = self.extra_join_123
         obj.deferred_loading = deepcopy(self.deferred_loading)
         if self.filter_is_sticky and self.used_aliases:
             obj.used_aliases = self.used_aliases.copy()
@@ -390 +392 @@
         result.append('FROM')
         result.extend(from_)
         params.extend(f_params)
+        
+        if self.extra_join_123:
+            result.append(' '.join(self.extra_join_123))
 
         if where:
             result.append('WHERE %s' % where)
@@ -2095 +2100 @@
         self.related_select_cols = []
         self.related_select_fields = []
 
-    def add_extra(self, select, select_params, where, params, tables, order_by):
+    def add_extra(self, select, select_params, where, params, tables, order_by, join=None):
         """
         Adds data to the various extra_* attributes for user-created additions
         to the query.
@@ -2128 +2133 @@
             self.extra_tables += tuple(tables)
         if order_by:
             self.extra_order_by = order_by
+        if join:
+            self.extra_join_123 += tuple(join)
 
     def clear_deferred_loading(self):
         """

django/db/models/query.py

@@ -570 +570 @@
         return obj
 
     def extra(self, select=None, where=None, params=None, tables=None,
-              order_by=None, select_params=None):
+              order_by=None, select_params=None, join=None):
         """
         Adds extra SQL fragments to the query.
         """
         assert self.query.can_filter(), \
                 "Cannot change a query once a slice has been taken"
         clone = self._clone()
-        clone.query.add_extra(select, select_params, where, params, tables, order_by)
+        clone.query.add_extra(select, select_params, where, params, tables, order_by, join)
         return clone
 
     def reverse(self):