Templates

venv/lib/python3.7/site-packages/django/db/backends/ddl_references.py

@@ -110,13 +110,14 @@ class IndexColumns(Columns):
 
     def __str__(self):
         def col_str(column, idx):
-            try:
-                col = self.quote_name(column) + self.col_suffixes[idx]
-            except IndexError:
-                col = self.quote_name(column)
             # Index.__init__() guarantees that self.opclasses is the same
             # length as self.columns.
-            return '{} {}'.format(col, self.opclasses[idx])
+            col = '{} {}'.format(self.quote_name(column), self.opclasses[idx])
+            try:
+                col = '{} {}'.format(col, self.col_suffixes[idx])
+            except IndexError:
+                pass
+            return col
 
         return ', '.join(col_str(column, idx) for idx, column in enumerate(self.columns))
 

venv/lib/python3.7/site-packages/django/db/models/fields/__init__.py

@@ -743,8 +743,12 @@ class Field(RegisterLookupMixin):
             if not getattr(cls, self.attname, None):
                 setattr(cls, self.attname, DeferredAttribute(self.attname))
         if self.choices:
-            setattr(cls, 'get_%s_display' % self.name,
-                    partialmethod(cls._get_FIELD_display, field=self))
+            if not hasattr(cls, 'get_%s_display' % self.name):
+                setattr(
+                    cls,
+                    'get_%s_display' % self.name,
+                    partialmethod(cls._get_FIELD_display, field=self),
+                )
 
     def get_filter_kwargs_for_object(self, obj):
         """