diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/gis/install/index.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 14 | ||||
| -rw-r--r-- | docs/ref/models/expressions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/indexes.txt | 6 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt index 52cfdcdeb5..b207094dbb 100644 --- a/docs/ref/contrib/gis/install/index.txt +++ b/docs/ref/contrib/gis/install/index.txt @@ -57,7 +57,7 @@ supported versions, and any notes for each of the supported database backends: Database Library Requirements Supported Versions Notes ================== ============================== ================== ========================================= PostgreSQL GEOS, GDAL, PROJ, PostGIS 12+ Requires PostGIS. -MySQL GEOS, GDAL 8+ :ref:`Limited functionality <mysql-spatial-limitations>`. +MySQL GEOS, GDAL 8.0.11+ :ref:`Limited functionality <mysql-spatial-limitations>`. Oracle GEOS, GDAL 19+ XE not supported. SQLite GEOS, GDAL, PROJ, SpatiaLite 3.21.0+ Requires SpatiaLite 4.3+ ================== ============================== ================== ========================================= diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 0d0409180c..aa55446607 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -412,7 +412,7 @@ MySQL notes Version support --------------- -Django supports MySQL 8 and higher. +Django supports MySQL 8.0.11 and higher. Django's ``inspectdb`` feature uses the ``information_schema`` database, which contains detailed data on all database schemas. @@ -755,14 +755,14 @@ MySQL and MariaDB do not support some options to the ``SELECT ... FOR UPDATE`` statement. If ``select_for_update()`` is used with an unsupported option, then a :exc:`~django.db.NotSupportedError` is raised. -=============== ========= ========== +=============== ========= ===== Option MariaDB MySQL -=============== ========= ========== -``SKIP LOCKED`` X (≥10.6) X (≥8.0.1) -``NOWAIT`` X X (≥8.0.1) -``OF`` X (≥8.0.1) +=============== ========= ===== +``SKIP LOCKED`` X (≥10.6) X +``NOWAIT`` X X +``OF`` X ``NO KEY`` -=============== ========= ========== +=============== ========= ===== When using ``select_for_update()`` on MySQL, make sure you filter a queryset against at least a set of fields contained in unique constraints or only diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index c72cf5a853..abae25f09c 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -880,7 +880,7 @@ from groups to be included: Support for filtering against window functions was added. -Among Django's built-in database backends, MySQL 8.0.2+, PostgreSQL, and Oracle +Among Django's built-in database backends, MySQL, PostgreSQL, and Oracle support window expressions. Support for different window expression features varies among the different databases. For example, the options in :meth:`~django.db.models.Expression.asc` and diff --git a/docs/ref/models/indexes.txt b/docs/ref/models/indexes.txt index d23a5fd1ce..6046abf029 100644 --- a/docs/ref/models/indexes.txt +++ b/docs/ref/models/indexes.txt @@ -82,10 +82,10 @@ field's name. For example ``Index(fields=['headline', '-pub_date'])`` would create SQL with ``(headline, pub_date DESC)``. -.. admonition:: MySQL and MariaDB +.. admonition:: MariaDB - Index ordering isn't supported on MySQL < 8.0.1 and MariaDB < 10.8. In that - case, a descending index is created as a normal index. + Index ordering isn't supported on MariaDB < 10.8. In that case, a + descending index is created as a normal index. ``name`` -------- diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 8a9733786a..1c73a7f085 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1928,8 +1928,8 @@ them: The ``postgresql``, ``oracle``, and ``mysql`` database backends support ``select_for_update()``. However, MariaDB only supports the ``nowait`` argument, MariaDB 10.6+ also supports the ``skip_locked`` argument, and MySQL -8.0.1+ supports the ``nowait``, ``skip_locked``, and ``of`` arguments. The -``no_key`` argument is only supported on PostgreSQL. +supports the ``nowait``, ``skip_locked``, and ``of`` arguments. The ``no_key`` +argument is only supported on PostgreSQL. Passing ``nowait=True``, ``skip_locked=True``, ``no_key=True``, or ``of`` to ``select_for_update()`` using database backends that do not support these |