p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #35803 -- Added support for __covers GIS lookup on MySQL.

This commit is contained in:
Mariusz Felisiak 2024-09-29 19:46:26 +02:00 committed by Sarah Boyce
parent c77573716a
commit 5cf88dcc57
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/backends/mysql/operations.py
View File

@ -60,6 +60,8 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
operators["relate"] = SpatialOperator(func="ST_Relate") operators["relate"] = SpatialOperator(func="ST_Relate")
if self.connection.mysql_version < (11, 7): if self.connection.mysql_version < (11, 7):
del operators["coveredby"] del operators["coveredby"]
else:
operators["covers"] = SpatialOperator(func="MBRCovers")
return operators return operators
@cached_property @cached_property

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

@ -348,7 +348,7 @@ Lookup Type PostGIS Oracle MariaDB MySQL [#]_ S
:lookup:`contains <gis-contains>` X X X X X B :lookup:`contains <gis-contains>` X X X X X B
:lookup:`contains_properly` X B :lookup:`contains_properly` X B
:lookup:`coveredby` X X X (≥ 11.7) X X B :lookup:`coveredby` X X X (≥ 11.7) X X B
:lookup:`covers` X X X B :lookup:`covers` X X X X B
:lookup:`crosses` X X X X C :lookup:`crosses` X X X X C
:lookup:`disjoint` X X X X X B :lookup:`disjoint` X X X X X B
:lookup:`distance_gt` X X X X X N :lookup:`distance_gt` X X X X X N

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

@ -212,7 +212,7 @@ SpatiaLite ``CoveredBy(poly, geom)``
---------- ----------
*Availability*: `PostGIS <https://postgis.net/docs/ST_Covers.html>`__, *Availability*: `PostGIS <https://postgis.net/docs/ST_Covers.html>`__,
Oracle, PGRaster (Bilateral), SpatiaLite Oracle, MySQL, PGRaster (Bilateral), SpatiaLite
Tests if no point in the lookup geometry is outside the geometry field. Tests if no point in the lookup geometry is outside the geometry field.
[#fncovers]_ [#fncovers]_
@ -226,9 +226,14 @@ Backend SQL Equivalent
========== ========================== ========== ==========================
PostGIS ``ST_Covers(poly, geom)`` PostGIS ``ST_Covers(poly, geom)``
Oracle ``SDO_COVERS(poly, geom)`` Oracle ``SDO_COVERS(poly, geom)``
MySQL ``MBRCovers(poly, geom)``
SpatiaLite ``Covers(poly, geom)`` SpatiaLite ``Covers(poly, geom)``
========== ========================== ========== ==========================
.. versionchanged:: 5.2
MySQL support was added.
.. fieldlookup:: crosses .. fieldlookup:: crosses
``crosses`` ``crosses``

2
docs/releases/5.2.txt
View File

@ -100,7 +100,7 @@ Minor features
:meth:`.OGRGeometry.get_linear_geometry` and :meth:`.OGRGeometry.get_linear_geometry` and
:meth:`.OGRGeometry.get_curve_geometry` methods. :meth:`.OGRGeometry.get_curve_geometry` methods.
* :lookup:`coveredby` lookup is now supported on MySQL. * :lookup:`coveredby` and :lookup:`covers` lookup are now supported on MySQL.
* :lookup:`coveredby` and :lookup:`isvalid` lookups, * :lookup:`coveredby` and :lookup:`isvalid` lookups,
:class:`~django.contrib.gis.db.models.Collect` aggregation, and :class:`~django.contrib.gis.db.models.Collect` aggregation, and