From 848a0674c45b605464d42a8b3682de8b15c7e32c Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Thu, 29 Oct 2015 15:21:46 +0500 Subject: [PATCH] [1.9.x] Fixed #25630 -- Replaced `AsGeoHash` with `GeoHash` in unsupported GIS functions Backport of 7521bb95d5 from master. --- django/contrib/gis/db/backends/base/operations.py | 4 ++-- 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):