summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2015-10-29 15:21:46 +0500
committerClaude Paroz <claude@2xlibre.net>2015-10-29 13:34:12 +0100
commit7521bb95d5caec35f7105fd2e0220c7666c1ecb3 (patch)
tree8193dc1e5d22b3fe64ddf64103c6f7441a7e226e
parent1a10ae45b102bd6dab15ef0bd95cda91635916ad (diff)
Fixed #25630 -- Replaced `AsGeoHash` with `GeoHash` in unsupported GIS functions
-rw-r--r--django/contrib/gis/db/backends/base/operations.py4
-rw-r--r--django/contrib/gis/db/backends/oracle/operations.py6
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 bb98846fc2..722ef9f29b 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):