Ticket #6623: 6623-4.diff

django/db/backends/__init__.py

@@ -102 +102 @@
             self._dirty = False
         self._enter_transaction_management(managed)
 
-    def leave_transaction_management(self):
+    def leave_transaction_management(self, exception=None):
         """
         Leaves transaction management for a running thread. A dirty flag is carried
         over to the surrounding block, as a commit will commit all changes, even
         those from outside. (Commits are on connection level.)
+
+        If this function is called from within a finally block where an
+        exception is in the process of working its way up the stack, pass
+        the exception argument so we don't raise a new exception over the
+        pending one.
         """
         self._leave_transaction_management(self.is_managed())
         if self.transaction_state:
@@ -116 +121 @@
                 "management")
         if self._dirty:
             self.rollback()
-            raise TransactionManagementError("Transaction managed block ended with "
-                "pending COMMIT/ROLLBACK")
+            if exception is None:
+                raise TransactionManagementError("Transaction managed block "
+                "ended with pending COMMIT/ROLLBACK")
         self._dirty = False
 
     def validate_thread_sharing(self):

django/db/transaction.py

@@ -40 +40 @@
     connection = connections[using]
     connection.enter_transaction_management(managed)
 
-def leave_transaction_management(using=None):
+def leave_transaction_management(using=None, exception=None):
     """
     Leaves transaction management for a running thread. A dirty flag is carried
     over to the surrounding block, as a commit will commit all changes, even
@@ -49 +49 @@
     if using is None:
         using = DEFAULT_DB_ALIAS
     connection = connections[using]
-    connection.leave_transaction_management()
+    connection.leave_transaction_management(exception)
 
 def is_dirty(using=None):
     """
@@ -285 +285 @@
         managed(True, using=using)
 
     def exiting(exc_value, using):
-        leave_transaction_management(using=using)
+        leave_transaction_management(using=using, exception=exc_value)
 
     return _transaction_func(entering, exiting, using)

tests/regressiontests/transactions_regress/tests.py

@@ -1 +1 @@
 from __future__ import absolute_import
 
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.db import connection, transaction
 from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
 from django.test import TransactionTestCase, skipUnlessDBFeature
@@ -175 +175 @@
         self.test_failing_query_transaction_closed()
 
 
+class TestExceptionDuringTransaction(TransactionTestCase):
+    """ When an exception happens during a transaction, the transaction should
+        not swallow the original exception and replace it by a
+        TransactionManagementError. The original exception should have priority.
+    """
+
+    def test_commit_manually_exception_raised(self):
+        @commit_manually
+        def fun_with_exception():
+            _ = Mod.objects.get(fld=777)
+
+        self.assertRaises(ObjectDoesNotExist, fun_with_exception)
+
+    def test_commit_on_success_exception_raised(self):
+        @commit_on_success
+        def fun_with_exception():
+            _ = Mod.objects.get(fld=777)
+
+        self.assertRaises(ObjectDoesNotExist, fun_with_exception)
+
+
 class TestManyToManyAddTransaction(TransactionTestCase):
     def test_manyrelated_add_commit(self):
         "Test for https://code.djangoproject.com/ticket/16818"