summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-16 14:39:13 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-16 14:40:43 +0200
commitaa28213eb51ba26b349c2e51f2defcc7cc87780e (patch)
treedc917316f5a32b7733f19be9ee09e7d62d0908c7 /docs
parent26ac7ae080ad5ae1c8ddce29fc3b6757b7b3f28a (diff)
[2.2.x] Refs #28436 -- Corrected docs regarding MySQL support of distance lookups.
Backport of 440603a4bc0dc4f0b489489e80dcbab0ca736d23 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/db-api.txt12
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt4
2 files changed, 10 insertions, 6 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 7497e60377..329ea78dfb 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -225,7 +225,7 @@ in the :doc:`model-api` documentation for more details.
Distance Lookups
----------------
-*Availability*: PostGIS, Oracle, SpatiaLite, PGRaster (Native)
+*Availability*: PostGIS, MySQL, Oracle, SpatiaLite, PGRaster (Native)
The following distance lookups are available:
@@ -233,7 +233,7 @@ The following distance lookups are available:
* :lookup:`distance_lte`
* :lookup:`distance_gt`
* :lookup:`distance_gte`
-* :lookup:`dwithin`
+* :lookup:`dwithin` (except MySQL)
.. note::
@@ -328,10 +328,10 @@ Lookup Type PostGIS Oracle MySQL [#]_ SpatiaLite
:lookup:`covers` X X X B
:lookup:`crosses` X X C
:lookup:`disjoint` X X X X B
-:lookup:`distance_gt` X X X N
-:lookup:`distance_gte` X X X N
-:lookup:`distance_lt` X X X N
-:lookup:`distance_lte` X X X N
+:lookup:`distance_gt` X X X X N
+:lookup:`distance_gte` X X X X N
+:lookup:`distance_lt` X X X X N
+:lookup:`distance_lte` X X X X N
:lookup:`dwithin` X X X B
:lookup:`equals` X X X X C
:lookup:`exact` X X X X B
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 154d8736f8..38e9fec133 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -696,6 +696,7 @@ Example::
Backend SQL Equivalent
========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) > 5``
+MySQL ``ST_Distance(poly, geom) > 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) > 5``
SpatiaLite ``Distance(poly, geom) > 5``
========== ==================================================
@@ -716,6 +717,7 @@ Example::
Backend SQL Equivalent
========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) >= 5``
+MySQL ``ST_Distance(poly, geom) >= 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) >= 5``
SpatiaLite ``Distance(poly, geom) >= 5``
========== ===================================================
@@ -736,6 +738,7 @@ Example::
Backend SQL Equivalent
========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) < 5``
+MySQL ``ST_Distance(poly, geom) < 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) < 5``
SpatiaLite ``Distance(poly, geom) < 5``
========== ==================================================
@@ -756,6 +759,7 @@ Example::
Backend SQL Equivalent
========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) <= 5``
+MySQL ``ST_Distance(poly, geom) <= 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) <= 5``
SpatiaLite ``Distance(poly, geom) <= 5``
========== ===================================================