summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2015-12-03 10:42:22 +0500
committerTim Graham <timograham@gmail.com>2015-12-03 12:59:01 -0500
commit395af23ac1f3499b21eba5ca085200bfce251290 (patch)
tree3898120a254a1cdd05e318dad39849d0c04e4105 /docs
parent83a710b8d3bfb2ac94ba9ae0672bd7b550339629 (diff)
Refs #25659 -- Added missing docs for Difference/Intersection/SymDifference functions.
Complements 7127eb287fb08b89a31bc97097a1fb6b08ada463.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/functions.txt18
-rw-r--r--docs/releases/1.10.txt6
2 files changed, 21 insertions, 3 deletions
diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index a5e4dcbba5..8fa45efbc7 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -186,12 +186,16 @@ Difference
.. class:: Difference(expr1, expr2, **extra)
-*Availability*: PostGIS, Oracle, SpatiaLite
+*Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric
difference, that is the part of geometry A that does not intersect with
geometry B.
+.. versionchanged:: 1.10
+
+ MySQL support was added.
+
Distance
--------
@@ -274,11 +278,15 @@ Intersection
.. class:: Intersection(expr1, expr2, **extra)
-*Availability*: PostGIS, Oracle, SpatiaLite
+*Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric
intersection between them.
+.. versionchanged:: 1.10
+
+ MySQL support was added.
+
Length
------
@@ -395,12 +403,16 @@ SymDifference
.. class:: SymDifference(expr1, expr2, **extra)
-*Availability*: PostGIS, Oracle, SpatiaLite
+*Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric
symmetric difference (union without the intersection) between the given
parameters.
+.. versionchanged:: 1.10
+
+ MySQL support was added.
+
Transform
---------
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index d1b6403f9f..8b64eadde3 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -82,6 +82,12 @@ Minor features
* Added support for the :class:`~django.contrib.gis.db.models.MakeLine`
aggregate on SpatiaLite.
+* Added support for the
+ :class:`~django.contrib.gis.db.models.functions.Difference`,
+ :class:`~django.contrib.gis.db.models.functions.Intersection`, and
+ :class:`~django.contrib.gis.db.models.functions.SymDifference`
+ functions on MySQL.
+
:mod:`django.contrib.messages`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^