summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2014-04-10 03:40:33 +0300
committerShai Berger <shai@platonix.com>2014-04-10 03:44:45 +0300
commitd5cef2a19c5a70766693264d08605f56d26e573d (patch)
tree13af5ce25fb1e4bcb70ee48954f9cc9d8f4eb9c0
parent690a5984a3c0a706b8cc296bdcccd524b2079559 (diff)
[1.6.x] Documentation fixes for the select_for_update change.
Refs #22343; thanks Tim Graham for the fixes.
-rw-r--r--docs/ref/models/querysets.txt2
-rw-r--r--docs/releases/1.6.3.txt14
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 14e2cfac18..a7bbf4d290 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1314,7 +1314,7 @@ do not support ``nowait``, such as MySQL, will cause a
:exc:`~django.db.DatabaseError` to be raised. This is in order to prevent code
unexpectedly blocking.
-Executing a queryset with ``select_for_update`` in autocommit mode is
+Evaluating a queryset with ``select_for_update`` in autocommit mode is
an error because the rows are then not locked. If allowed, this would
facilitate data corruption, and could easily be caused by calling,
outside of any transaction, code that expects to be run in one.
diff --git a/docs/releases/1.6.3.txt b/docs/releases/1.6.3.txt
index c6981fa96b..f2cf261290 100644
--- a/docs/releases/1.6.3.txt
+++ b/docs/releases/1.6.3.txt
@@ -17,19 +17,19 @@ executed in autocommit mode, outside of a transaction. Before Django
lock records until the next write operation. Django 1.6 introduced
database-level autocommit; since then, execution in such a context
voids the effect of ``select_for_update()``. It is, therefore, assumed
-now to be an error, and raises an exception.
-
-This change may cause test failures if you use ``select_for_update()``
-in a test class which is a subclass of
-:class:`~django.test.TransactionTestCase` rather than
-:class:`~django.test.TestCase`.
+now to be an error and raises an exception.
This change was made because such errors can be caused by including an
app which expects global transactions (e.g. :setting:`ATOMIC_REQUESTS
-<DATABASE-ATOMIC_REQUESTS>` set to True), or Django's old autocommit
+<DATABASE-ATOMIC_REQUESTS>` set to ``True``), or Django's old autocommit
behavior, in a project which runs without them; and further, such
errors may manifest as data-corruption bugs.
+This change may cause test failures if you use ``select_for_update()``
+in a test class which is a subclass of
+:class:`~django.test.TransactionTestCase` rather than
+:class:`~django.test.TestCase`.
+
Other bugfixes and changes
==========================