p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[3.0.x] Refs #28436 -- Corrected docs regarding MySQL support of distance lookups. 

Backport of 440603a4bc from master
This commit is contained in:
Mariusz Felisiak 2019-10-16 14:39:13 +02:00
parent 76e159e2c3
commit 8047961d7c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/ref/contrib/gis/db-api.txt
View File

@ -219,7 +219,7 @@ in the :doc:`model-api` documentation for more details.
Distance Lookups Distance Lookups
---------------- ----------------
*Availability*: PostGIS, Oracle, SpatiaLite, PGRaster (Native) *Availability*: PostGIS, MySQL, Oracle, SpatiaLite, PGRaster (Native)
The following distance lookups are available: The following distance lookups are available:
@ -227,7 +227,7 @@ The following distance lookups are available:
* :lookup:`distance_lte` * :lookup:`distance_lte`
* :lookup:`distance_gt` * :lookup:`distance_gt`
* :lookup:`distance_gte` * :lookup:`distance_gte`
* :lookup:`dwithin` * :lookup:`dwithin` (except MySQL)
.. note:: .. note::
@ -322,10 +322,10 @@ Lookup Type PostGIS Oracle MySQL [#]_ SpatiaLite
:lookup:`covers` X X X B :lookup:`covers` X X X B
:lookup:`crosses` X X X C :lookup:`crosses` X X X C
:lookup:`disjoint` X X X X B :lookup:`disjoint` X X X X B
:lookup:`distance_gt` X X X N :lookup:`distance_gt` X X X X N
:lookup:`distance_gte` X X X N :lookup:`distance_gte` X X X X N
:lookup:`distance_lt` X X X N :lookup:`distance_lt` X X X X N
:lookup:`distance_lte` X X X N :lookup:`distance_lte` X X X X N
:lookup:`dwithin` X X X B :lookup:`dwithin` X X X B
:lookup:`equals` X X X X C :lookup:`equals` X X X X C
:lookup:`exact` X X X X B :lookup:`exact` X X X X B

4
docs/ref/contrib/gis/geoquerysets.txt
View File

@ -765,6 +765,7 @@ Example::
Backend SQL Equivalent Backend SQL Equivalent
========== ================================================== ========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) > 5`` 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`` Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) > 5``
SpatiaLite ``Distance(poly, geom) > 5`` SpatiaLite ``Distance(poly, geom) > 5``
========== ================================================== ========== ==================================================
@ -785,6 +786,7 @@ Example::
Backend SQL Equivalent Backend SQL Equivalent
========== =================================================== ========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) >= 5`` 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`` Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) >= 5``
SpatiaLite ``Distance(poly, geom) >= 5`` SpatiaLite ``Distance(poly, geom) >= 5``
========== =================================================== ========== ===================================================
@ -805,6 +807,7 @@ Example::
Backend SQL Equivalent Backend SQL Equivalent
========== ================================================== ========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) < 5`` 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`` Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) < 5``
SpatiaLite ``Distance(poly, geom) < 5`` SpatiaLite ``Distance(poly, geom) < 5``
========== ================================================== ========== ==================================================
@ -825,6 +828,7 @@ Example::
Backend SQL Equivalent Backend SQL Equivalent
========== =================================================== ========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) <= 5`` 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`` Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) <= 5``
SpatiaLite ``Distance(poly, geom) <= 5`` SpatiaLite ``Distance(poly, geom) <= 5``
========== =================================================== ========== ===================================================