import changes from Django 2.0.3

Author: michiya

sql_server/pyodbc/compiler.py

@@ -255,7 +255,9 @@ def as_sql(self, with_limits=True, with_col_aliases=False):
                 # 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'),
@@ -269,7 +271,7 @@ def as_sql(self, with_limits=True, with_col_aliases=False):
                 return 'SELECT %s FROM (%s) subquery' % (
                     ', '.join(sub_selects),
                     ' '.join(result),
-                ), sub_params + params
+                ), tuple(sub_params + params)
 
             return ' '.join(result), tuple(params)
         finally: