From 53fc6ac64976a7693d2272050a03b71e56b16578 Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Sat, 6 Jan 2024 14:07:49 +0000 Subject: Fixed #35088 -- Added support for Collect on MySQL 8.0.24+. --- docs/ref/contrib/gis/db-api.txt | 18 +++++++++--------- docs/ref/contrib/gis/geoquerysets.txt | 6 +++++- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'docs/ref') 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 `_, 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 `__, +*Availability*: `PostGIS `__, 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`` ~~~~~~~~~~ -- cgit v1.3