innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[2.0.x] Refs #24254 -- Removed unnecessary SQL AS clause in SQLCompiler.as_sql(). 

Incorrect on Oracle.

Backport of 11ade8eefd from master
This commit is contained in:
Mariusz Felisiak 2017-10-06 18:47:41 +02:00 committed by Tim Graham
parent ef5d86555d
commit 71da2b4f11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/sql/compiler.py
View File

@ -564,7 +564,7 @@ class SQLCompiler:
subselect, subparams = select_clone.as_sql(self, self.connection) subselect, subparams = select_clone.as_sql(self, self.connection)
sub_selects.append(subselect) sub_selects.append(subselect)
sub_params.extend(subparams) sub_params.extend(subparams)
return 'SELECT %s FROM (%s) AS subquery' % ( return 'SELECT %s FROM (%s) subquery' % (
', '.join(sub_selects), ', '.join(sub_selects),
' '.join(result), ' '.join(result),
), sub_params + params ), sub_params + params