diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-22 18:09:55 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-22 18:09:55 +0000 |
| commit | 88488e5aa570f4ee552a2ce1399bd27f115b4546 (patch) | |
| tree | 9d0e2c64da8feed599467f2584cd304cbb63744a /django/db/models/sql | |
| parent | c43a3d78b1a7c65b903922679c76a499e484dea5 (diff) | |
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.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/subqueries.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 4cc1500c94..e16d540b66 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -420,7 +420,7 @@ class Query(object): 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), diff --git a/django/db/models/sql/subqueries.py b/django/db/models/sql/subqueries.py index 0c32abd6a5..2c5a93e417 100644 --- a/django/db/models/sql/subqueries.py +++ b/django/db/models/sql/subqueries.py @@ -361,7 +361,7 @@ class CountQuery(Query): """ 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 () |