summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNick Pope <nick@nickpope.me.uk>2024-01-06 14:07:49 +0000
committerGitHub <noreply@github.com>2024-01-06 15:07:49 +0100
commit53fc6ac64976a7693d2272050a03b71e56b16578 (patch)
treeef62957d4fdac3e8ddec226fa918a4e524976758 /docs
parent5c043286e2fde48a6230cbd2d91d5bdd3c49a418 (diff)
Fixed #35088 -- Added support for Collect on MySQL 8.0.24+.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/db-api.txt18
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt6
-rw-r--r--docs/releases/5.1.txt3
3 files changed, 17 insertions, 10 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index f2dd1c7bf4..bce6f2efcc 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -431,20 +431,20 @@ Aggregate Functions
-------------------
The following table provides a summary of what GIS-specific aggregate functions
-are available on each spatial backend. Please note that MySQL does not
+are available on each spatial backend. Please note that MariaDB does not
support any of these aggregates, and is thus excluded from the table.
.. currentmodule:: django.contrib.gis.db.models
-======================= ======= ====== ==========
-Aggregate PostGIS Oracle SpatiaLite
-======================= ======= ====== ==========
-:class:`Collect` X X
-:class:`Extent` X X X
+======================= ======= ====== ============ ==========
+Aggregate PostGIS Oracle MySQL SpatiaLite
+======================= ======= ====== ============ ==========
+:class:`Collect` X X (≥ 8.0.24) X
+:class:`Extent` X X X
:class:`Extent3D` X
-:class:`MakeLine` X X
-:class:`Union` X X X
-======================= ======= ====== ==========
+:class:`MakeLine` X X
+:class:`Union` X X X
+======================= ======= ====== ============ ==========
.. rubric:: Footnotes
.. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <https://portal.ogc.org/files/?artifact_id=829>`_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry).
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 99b8638a65..c0dd8d71c8 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -870,7 +870,7 @@ Example:
.. class:: Collect(geo_field, filter=None)
-*Availability*: `PostGIS <https://postgis.net/docs/ST_Collect.html>`__,
+*Availability*: `PostGIS <https://postgis.net/docs/ST_Collect.html>`__, MySQL,
SpatiaLite
Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
@@ -883,6 +883,10 @@ caring about dissolving boundaries.
Support for using the ``filter`` argument was added.
+.. versionchanged:: 5.1
+
+ MySQL 8.0.24+ support was added.
+
``Extent``
~~~~~~~~~~
diff --git a/docs/releases/5.1.txt b/docs/releases/5.1.txt
index 03ca07f298..e84a27a0ec 100644
--- a/docs/releases/5.1.txt
+++ b/docs/releases/5.1.txt
@@ -56,6 +56,9 @@ Minor features
* :class:`~django.contrib.gis.db.models.functions.BoundingCircle` is now
supported on SpatiaLite 5.1+.
+* :class:`~django.contrib.gis.db.models.Collect` is now supported on MySQL
+ 8.0.24+.
+
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~