Ticket #7055: join_alias_no_as.diff

django/db/models/sql/query.py

@@ -420 +420 @@
             if not self.alias_refcount[alias]:
                 continue
             name, alias, join_type, lhs, lhs_col, col, nullable = self.alias_map[alias]
-            alias_str = (alias != name and ' AS %s' % alias or '')
+            alias_str = (alias != name and ' %s' % alias or '')
             if join_type and not first:
                 result.append('%s %s%s ON (%s.%s = %s.%s)'
                         % (join_type, qn(name), alias_str, qn(lhs),

django/db/models/sql/subqueries.py

@@ -361 +361 @@
     """
     def get_from_clause(self):
         result, params = self._query.as_sql()
-        return ['(%s) AS A1' % result], params
+        return ['(%s) A1' % result], params
 
     def get_ordering(self):
         return ()