Changeset 7439

Timestamp:

04/22/08 13:09:55 (4 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Don't use the "AS" keyword in the FROM-clause. Fixed #7055.
Patch from Ian Kelly.

This keyword is optional in SQL, but not permitted by Oracle. If we ever need
to support a backend that requires this keyword at some later date, we can make
it a connection.feature option, but that's overkill for now.

Files:

• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (1 diff)
• django/branches/queryset-refactor/django/db/models/sql/subqueries.py (modified) (1 diff)

django/branches/queryset-refactor/django/db/models/sql/query.py

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

django/branches/queryset-refactor/django/db/models/sql/subqueries.py

@@ -362 +362 @@
-    def get_from_clause(self):
-        result, params = self._query.as_sql()
-S A
+
-
-    def get_ordering(self):