diff options
| author | Ran Benita <ran234@gmail.com> | 2017-04-11 18:52:53 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-04-11 11:52:53 -0400 |
| commit | 2a6b4e65214ff60ee50b14fb33916a2b58e9fcbe (patch) | |
| tree | 1e44bf27bee8c10280a16b35cda3dbaaf6a6368f /docs | |
| parent | 5dbf1c4b23cda915369f4895be293369575238d0 (diff) | |
Updated docs after changing select_for_update() to raise NotSupportedError.
Follow up to 054a44d6f0f75395bd02a21e31ea904a24750a2b.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/databases.txt | 3 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 42e335c9c6..7960688202 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -569,7 +569,8 @@ Row locking with ``QuerySet.select_for_update()`` MySQL does not support the ``NOWAIT`` and ``SKIP LOCKED`` options to the ``SELECT ... FOR UPDATE`` statement. If ``select_for_update()`` is used with -``nowait=True`` or ``skip_locked=True`` then a ``DatabaseError`` will be raised. +``nowait=True`` or ``skip_locked=True``, then a +:exc:`~django.db.NotSupportedError` is raised. Automatic typecasting can cause unexpected results -------------------------------------------------- diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index e98f0202ce..867ce47ce3 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1640,8 +1640,8 @@ backends support ``select_for_update()``. However, MySQL doesn't support the ``nowait`` and ``skip_locked`` arguments. Passing ``nowait=True`` or ``skip_locked=True`` to ``select_for_update()`` -using database backends that do not support these options, such as MySQL, will -cause a :exc:`~django.db.DatabaseError` to be raised. This prevents code from +using database backends that do not support these options, such as MySQL, +raises a :exc:`~django.db.NotSupportedError`. This prevents code from unexpectedly blocking. Evaluating a queryset with ``select_for_update()`` in autocommit mode on |