summaryrefslogtreecommitdiff
path: root/django/contrib
diff options
context:
space:
mode:
authorsnowman2 <alansnow21@gmail.com>2021-05-13 13:02:31 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-05-14 07:10:28 +0200
commit29345aecf6e8d53ccb3577a3762bb0c263f7558d (patch)
treec424880b887d92557b0d236f8ac574eb86d04641 /django/contrib
parent99bc67a9e79256d8a2fcd5742e33a5e79c056539 (diff)
downloaddjango-29345aecf6e8d53ccb3577a3762bb0c263f7558d.tar.gz
Fixed #32721 -- Fixed migrations crash when adding namespaced spatial indexes on PostGIS.
Diffstat (limited to 'django/contrib')
-rw-r--r--django/contrib/gis/db/backends/postgis/schema.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/django/contrib/gis/db/backends/postgis/schema.py b/django/contrib/gis/db/backends/postgis/schema.py
index a4b4910c36..c574bed84f 100644
--- a/django/contrib/gis/db/backends/postgis/schema.py
+++ b/django/contrib/gis/db/backends/postgis/schema.py
@@ -33,10 +33,9 @@ class PostGISSchemaEditor(DatabaseSchemaEditor):
elif field.dim > 2 and not field.geography:
# Use "nd" ops which are fast on multidimensional cases
opclasses = [self.geom_index_ops_nd]
- if not kwargs.get('name'):
- name = '%s_%s_id' % (model._meta.db_table, field.column)
- else:
- name = kwargs['name']
+ name = kwargs.get('name')
+ if not name:
+ name = self._create_index_name(model._meta.db_table, [field.column], '_id')
return super()._create_index_sql(
model,