summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 3080b8c3ee..1f78a8b5b2 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -547,7 +547,9 @@ class SQLCompiler:
# to exclude extraneous selects.
sub_selects = []
sub_params = []
- for select, _, alias in self.select:
+ for index, (select, _, alias) in enumerate(self.select, start=1):
+ if not alias and with_col_aliases:
+ alias = 'col%d' % index
if alias:
sub_selects.append("%s.%s" % (
self.connection.ops.quote_name('subquery'),
@@ -561,7 +563,7 @@ class SQLCompiler:
return 'SELECT %s FROM (%s) subquery' % (
', '.join(sub_selects),
' '.join(result),
- ), sub_params + params
+ ), tuple(sub_params + params)
return ' '.join(result), tuple(params)
finally: