Ticket #8375: custom_alias_for_extra_tables_query.patch

django/db/models/sql/query.py

@@ -540 +540 @@
                 result.append('%s%s%s' % (connector, qn(name), alias_str))
             first = False
         for t in self.extra_tables:
-            alias, unused = self.table_alias(t)
-            if alias not in self.alias_map:
+            name_alias_list = t.split()
+            if len(name_alias_list) > 1:
+                table_name = name_alias_list[0]
+                alias = name_alias_list[1]
                 connector = not first and ', ' or ''
-                result.append('%s%s' % (connector, qn(alias)))
+                result.append('%s%s %s' % (connector, qn(table_name), qn(alias)))
                 first = False
+            else:
+                alias, unused = self.table_alias(t)
+                if alias not in self.alias_map:
+                    connector = not first and ', ' or ''
+                    result.append('%s%s' % (connector, qn(alias)))
+                    first = False
         return result, []
 
     def get_grouping(self):