From 77b88fe621bb7828535a4c4cf37d9d4ac01b146b Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 8 Jul 2021 06:51:10 +0200 Subject: Fixed #32908 -- Allowed select_for_update(skip_locked) on MariaDB 10.6+. --- docs/ref/models/querysets.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'docs/ref/models') diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index c24079ec10..408224aed1 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1792,11 +1792,11 @@ them:: >>> Person.objects.select_related('hometown').select_for_update().exclude(hometown=None) , ...]> -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``, -``skip_locked``, and ``of`` arguments. The ``no_key`` argument is supported -only on PostgreSQL. +The ``postgresql``, ``oracle``, and ``mysql`` database backends support +``select_for_update()``. However, MariaDB 10.3+ 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. Passing ``nowait=True``, ``skip_locked=True``, ``no_key=True``, or ``of`` to ``select_for_update()`` using database backends that do not support these @@ -1836,6 +1836,10 @@ raised if ``select_for_update()`` is used in autocommit mode. The ``of`` argument was allowed on MySQL 8.0.1+. +.. versionchanged:: 4.0 + + The ``skip_locked`` argument was allowed on MariaDB 10.6+. + ``raw()`` ~~~~~~~~~ -- cgit v1.3