diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2025-02-12 23:16:34 +0100 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-02-13 10:40:53 +0100 |
| commit | d3d9f3a5a4a0864dd626d1fe634c19c3ec9336d4 (patch) | |
| tree | 666e16dc6ca2b3158850a9b0bdbe3a79cb0a4deb | |
| parent | fc1961817115ae9737d64ca92942d02ce77d5fc2 (diff) | |
[5.2.x] Reverted "Refs #35803 -- Added support for __coveredby GIS lookup on MariaDB 11.7+."
This partly reverts commit 0b7edb9fcdd33d47ec5701b4f9b9553e27a88e95.
MariaDB reverted GIS functions.
Backport of 54a902c6e81214462388f79a7c42f1c88c863dfd from main.
| -rw-r--r-- | django/contrib/gis/db/backends/mysql/operations.py | 4 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/db-api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geoquerysets.txt | 5 | ||||
| -rw-r--r-- | docs/releases/5.2.txt | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index 674931b938..ea9c6fd86f 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -45,7 +45,6 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): "bboverlaps": SpatialOperator(func="MBROverlaps"), # ... "contained": SpatialOperator(func="MBRWithin"), # ... "contains": SpatialOperator(func="ST_Contains"), - "coveredby": SpatialOperator(func="MBRCoveredBy"), "crosses": SpatialOperator(func="ST_Crosses"), "disjoint": SpatialOperator(func="ST_Disjoint"), "equals": SpatialOperator(func="ST_Equals"), @@ -58,10 +57,9 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): } if self.connection.mysql_is_mariadb: operators["relate"] = SpatialOperator(func="ST_Relate") - if self.connection.mysql_version < (11, 7): - del operators["coveredby"] else: operators["covers"] = SpatialOperator(func="MBRCovers") + operators["coveredby"] = SpatialOperator(func="MBRCoveredBy") return operators @cached_property diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt index 02b8fafb34..f2b036dac4 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -347,7 +347,7 @@ Lookup Type PostGIS Oracle MariaDB MySQL [#]_ S :lookup:`contained` X X X X N :lookup:`contains <gis-contains>` X X X X X B :lookup:`contains_properly` X B -:lookup:`coveredby` X X X (≥ 11.7) X X B +:lookup:`coveredby` X X X X B :lookup:`covers` X X X X B :lookup:`crosses` X X X X C :lookup:`disjoint` X X X X X B diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index 6384dad2c9..d73367465f 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -183,7 +183,7 @@ PostGIS ``ST_ContainsProperly(poly, geom)`` ------------- *Availability*: `PostGIS <https://postgis.net/docs/ST_CoveredBy.html>`__, -Oracle, MariaDB 11.7+, MySQL, PGRaster (Bilateral), SpatiaLite +Oracle, MySQL, PGRaster (Bilateral), SpatiaLite Tests if no point in the geometry field is outside the lookup geometry. [#fncovers]_ @@ -197,14 +197,13 @@ Backend SQL Equivalent ========== ============================= PostGIS ``ST_CoveredBy(poly, geom)`` Oracle ``SDO_COVEREDBY(poly, geom)`` -MariaDB ``MBRCoveredBy(poly, geom)`` MySQL ``MBRCoveredBy(poly, geom)`` SpatiaLite ``CoveredBy(poly, geom)`` ========== ============================= .. versionchanged:: 5.2 - MySQL and MariaDB 11.7+ support was added. + MySQL support was added. .. fieldlookup:: covers diff --git a/docs/releases/5.2.txt b/docs/releases/5.2.txt index 890b2ad288..3fdf934461 100644 --- a/docs/releases/5.2.txt +++ b/docs/releases/5.2.txt @@ -199,8 +199,6 @@ Minor features * :lookup:`coveredby` and :lookup:`covers` lookup are now supported on MySQL. -* :lookup:`coveredby` lookup is now supported on MariaDB 11.7+. - :mod:`django.contrib.syndication` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |