diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-22 22:14:17 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-30 09:42:27 +0200 |
| commit | 728548e483a5a3486939b0c8e62520296587482e (patch) | |
| tree | b83663722c2653334085f2b152f8695f88660b8f /django/db/transaction.py | |
| parent | 9595183d03cfd0d94ae2dd506a3d2b86cf5c74a7 (diff) | |
Fixed #21134 -- Prevented queries in broken transactions.
Squashed commit of the following:
commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 29 22:51:00 2013 +0200
Clarified interactions between atomic and exceptions.
commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 22 22:45:32 2013 +0200
Fixed TransactionManagementError in tests.
Previous commit introduced an additional check to prevent running
queries in transactions that will be rolled back, which triggered a few
failures in the tests. In practice using transaction.atomic instead of
the low-level savepoint APIs was enough to fix the problems.
commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Tue Sep 24 22:24:17 2013 +0200
Allowed nesting constraint_checks_disabled inside atomic.
Since MySQL handles transactions loosely, this isn't a problem.
commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat Sep 21 18:43:12 2013 +0200
Prevented running queries in transactions that will be rolled back.
This avoids a counter-intuitive behavior in an edge case on databases
with non-atomic transaction semantics.
It prevents using savepoint_rollback() inside an atomic block without
calling set_rollback(False) first, which is backwards-incompatible in
tests.
Refs #21134.
commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 22 22:14:17 2013 +0200
Replaced manual savepoints by atomic blocks.
This ensures the rollback flag is handled consistently in internal APIs.
Diffstat (limited to 'django/db/transaction.py')
| -rw-r--r-- | django/db/transaction.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py index 7509ad3788..86a357f1cc 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -16,14 +16,15 @@ import warnings from functools import wraps -from django.db import connections, DatabaseError, DEFAULT_DB_ALIAS +from django.db import ( + connections, DEFAULT_DB_ALIAS, + DatabaseError, ProgrammingError) from django.utils.decorators import available_attrs -class TransactionManagementError(Exception): +class TransactionManagementError(ProgrammingError): """ - This exception is thrown when something bad happens with transaction - management. + This exception is thrown when transaction management is used improperly. """ pass |