diff options
| author | Simon Charette <charette.s@gmail.com> | 2020-07-12 00:25:03 -0400 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-07-13 10:15:43 +0200 |
| commit | ca6c5e5fc23f2855a7094d195f09975b21a7ec3f (patch) | |
| tree | 3236fe184e33463bb6c74cd4f5ac1f81cc631933 /docs | |
| parent | f36862b69c3325da8ba6892a6057bbd9470efd70 (diff) | |
Fixed #31770 -- Allowed select_for_update(of) on MySQL 8.0.1+.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 8 | ||||
| -rw-r--r-- | docs/releases/3.2.txt | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 49eaccb0b3..8c87eb6818 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -639,7 +639,7 @@ Option MariaDB MySQL =============== ========= ========== ``SKIP LOCKED`` X (≥8.0.1) ``NOWAIT`` X (≥10.3) X (≥8.0.1) -``OF`` +``OF`` X (≥8.0.1) ``NO KEY`` =============== ========= ========== diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 9f541d5414..bef6938263 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1729,9 +1729,9 @@ them:: Currently, the ``postgresql``, ``oracle``, and ``mysql`` database backends support ``select_for_update()``. However, MariaDB 10.3+ supports only -the ``nowait`` argument and MySQL 8.0.1+ supports the ``nowait`` and -``skip_locked`` arguments. MySQL and MariaDB don't support the ``of`` argument. -The ``no_key`` argument is supported only on PostgreSQL. +the ``nowait`` argument and MySQL 8.0.1+ supports the ``nowait``, +``skip_locked``, and ``of`` arguments. The ``no_key`` argument is supported +only 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 @@ -1769,6 +1769,8 @@ raised if ``select_for_update()`` is used in autocommit mode. The ``no_key`` argument was added. + The ``of`` argument was allowed on MySQL 8.0.1+. + ``raw()`` ~~~~~~~~~ diff --git a/docs/releases/3.2.txt b/docs/releases/3.2.txt index 64b3b0257c..653e14a3a1 100644 --- a/docs/releases/3.2.txt +++ b/docs/releases/3.2.txt @@ -230,6 +230,9 @@ Models * :class:`FilteredRelation() <django.db.models.FilteredRelation>` now supports nested relations. +* The ``of`` argument of :meth:`.QuerySet.select_for_update()` is now allowed + on MySQL 8.0.1+. + Requests and Responses ~~~~~~~~~~~~~~~~~~~~~~ |