p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[2.0.x] Simplified GeometryField.select_format(). 

Backport of e9a370bb6a from master
This commit is contained in:
Sergey Fedoseev 2017-10-29 23:22:26 +05:00 committed by Tim Graham
parent c7b1224914
commit 05232cda2f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/backends/base/operations.py
View File

@ -16,7 +16,7 @@ class BaseSpatialOperations:
spatial_version = None spatial_version = None
# How the geometry column should be selected. # How the geometry column should be selected.
select = None select = '%s'
@cached_property @cached_property
def select_extent(self): def select_extent(self):

3
django/contrib/gis/db/models/fields.py
View File

@ -266,8 +266,7 @@ class GeometryField(BaseSpatialField):
of the spatial backend. For example, Oracle and MySQL require custom of the spatial backend. For example, Oracle and MySQL require custom
selection formats in order to retrieve geometries in OGC WKB. selection formats in order to retrieve geometries in OGC WKB.
""" """
select = compiler.connection.ops.select return compiler.connection.ops.select % sql, params
return select % sql if select else sql, params
# The OpenGIS Geometry Type Fields # The OpenGIS Geometry Type Fields