diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2015-10-29 15:21:46 +0500 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2015-10-29 13:35:34 +0100 |
| commit | 848a0674c45b605464d42a8b3682de8b15c7e32c (patch) | |
| tree | c4eb60692d7fa4cdd528d8ac6800b2583929163a | |
| parent | f1054d1f1d062ddbb04e23c35b14f98d37e73378 (diff) | |
[1.9.x] Fixed #25630 -- Replaced `AsGeoHash` with `GeoHash` in unsupported GIS functions
Backport of 7521bb95d5 from master.
| -rw-r--r-- | django/contrib/gis/db/backends/base/operations.py | 4 | ||||
| -rw-r--r-- | django/contrib/gis/db/backends/oracle/operations.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/gis/db/backends/base/operations.py b/django/contrib/gis/db/backends/base/operations.py index a560768bff..5dafae760d 100644 --- a/django/contrib/gis/db/backends/base/operations.py +++ b/django/contrib/gis/db/backends/base/operations.py @@ -56,9 +56,9 @@ class BaseSpatialOperations(object): # Blacklist/set of known unsupported functions of the backend unsupported_functions = { - 'Area', 'AsGeoHash', 'AsGeoJSON', 'AsGML', 'AsKML', 'AsSVG', + 'Area', 'AsGeoJSON', 'AsGML', 'AsKML', 'AsSVG', 'BoundingCircle', 'Centroid', 'Difference', 'Distance', 'Envelope', - 'ForceRHR', 'Intersection', 'Length', 'MemSize', 'NumGeometries', + 'ForceRHR', 'GeoHash', 'Intersection', 'Length', 'MemSize', 'NumGeometries', 'NumPoints', 'Perimeter', 'PointOnSurface', 'Reverse', 'Scale', 'SnapToGrid', 'SymDifference', 'Transform', 'Translate', 'Union', diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index 6e901129d9..f510306b72 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -126,10 +126,10 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations): truncate_params = {'relate': None} unsupported_functions = { - 'AsGeoHash', 'AsGeoJSON', 'AsGML', 'AsKML', 'AsSVG', + 'AsGeoJSON', 'AsGML', 'AsKML', 'AsSVG', 'BoundingCircle', 'Envelope', - 'ForceRHR', 'MemSize', 'Scale', - 'SnapToGrid', 'Translate', 'GeoHash', + 'ForceRHR', 'GeoHash', 'MemSize', 'Scale', + 'SnapToGrid', 'Translate', } def geo_quote_name(self, name): |