summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-17 14:02:37 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-18 07:46:31 +0200
commit3a8af298b95ac689ab7aebfa3ed1c64b82df7b71 (patch)
tree56e2b782988896f4ff8dc3a8f45e179d8da5c46a /docs/ref
parentbebf61de11e2ddd06902392d81ccaf005f5e31e4 (diff)
Fixed #30890 -- Added MariaDB support for the relate lookup.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/gis/db-api.txt2
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt13
2 files changed, 10 insertions, 5 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index ad896f3e5d..e7bd672914 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -332,7 +332,7 @@ Lookup Type PostGIS Oracle MariaDB MySQL [#]_ Sp
:lookup:`intersects` X X X X X B
:lookup:`isvalid` X X X (≥ 5.7.5) X (LWGEOM)
:lookup:`overlaps` X X X X X B
-:lookup:`relate` X X X C
+:lookup:`relate` X X X X C
:lookup:`same_as` X X X X X B
:lookup:`touches` X X X X X B
:lookup:`within` X X X X X B
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 6f191c0af4..7b5cae6e30 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -426,14 +426,15 @@ SpatiaLite ``Overlaps(poly, geom)``
----------
*Availability*: `PostGIS <https://postgis.net/docs/ST_Relate.html>`__,
-Oracle, SpatiaLite, PGRaster (Conversion)
+MariaDB, Oracle, SpatiaLite, PGRaster (Conversion)
Tests if the geometry field is spatially related to the lookup geometry by
the values given in the given pattern. This lookup requires a tuple parameter,
``(geom, pattern)``; the form of ``pattern`` will depend on the spatial backend:
-PostGIS & SpatiaLite
-~~~~~~~~~~~~~~~~~~~~
+MariaDB, PostGIS, and SpatiaLite
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
On these spatial backends the intersection pattern is a string comprising
nine characters, which define intersections between the interior, boundary,
and exterior of the geometry field and the lookup geometry.
@@ -447,7 +448,7 @@ Geometry example::
# the intersection pattern (the pattern here is for 'contains').
Zipcode.objects.filter(poly__relate=(geom, 'T*T***FF*'))
-PostGIS SQL equivalent:
+PostGIS and MariaDB SQL equivalent:
.. code-block:: sql
@@ -471,6 +472,10 @@ PostGIS SQL equivalent:
SELECT ... WHERE ST_Relate(poly, ST_Polygon(rast, 1), 'T*T***FF*')
SELECT ... WHERE ST_Relate(ST_Polygon(rast, 2), ST_Polygon(rast, 1), 'T*T***FF*')
+.. versionchanged:: 3.1
+
+ MariaDB support was added.
+
Oracle
~~~~~~