mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #30961 -- Fixed spaces in columns list SQL generated for indexes.

Browse Source
This commit is contained in:
Hannes Ljungberg
2019-11-07 21:26:08 +01:00
committed by Mariusz Felisiak
parent d5af43c8d1
commit 6d590bcf1f
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/backends/ddl_references.py
View File

@@ -83,10 +83,14 @@ class Columns(TableColumns):
def __str__(self):
def col_str(column, idx):
col = self.quote_name(column)
try:
return self.quote_name(column) + self.col_suffixes[idx]
suffix = self.col_suffixes[idx]
if suffix:
col = '{} {}'.format(col, suffix)
except IndexError:
return self.quote_name(column)
pass
return col
return ', '.join(col_str(column, idx) for idx, column in enumerate(self.columns))
@@ -114,7 +118,9 @@ class IndexColumns(Columns):
# length as self.columns.
col = '{} {}'.format(self.quote_name(column), self.opclasses[idx])
try:
col = '{} {}'.format(col, self.col_suffixes[idx])
suffix = self.col_suffixes[idx]
if suffix:
col = '{} {}'.format(col, suffix)
except IndexError:
pass
return col