Ticket #6669: 6669-2.diff

django/db/backends/util.py

@@ -16 +16 @@
         self.cursor = cursor
         self.db = db
 
-    def __getattr__(self, attr):
+    def _set_dirty(self):
         if self.db.is_managed():
             self.db.set_dirty()
+
+    def __getattr__(self, attr):
+        self._set_dirty()
         if attr in self.__dict__:
             return self.__dict__[attr]
         else:
@@ -31 +34 @@
 class CursorDebugWrapper(CursorWrapper):
 
     def execute(self, sql, params=()):
+        self._set_dirty()
         start = time()
         try:
             return self.cursor.execute(sql, params)
@@ -47 +51 @@
             )
 
     def executemany(self, sql, param_list):
+        self._set_dirty()
         start = time()
         try:
             return self.cursor.executemany(sql, param_list)

tests/regressiontests/transactions_regress/tests.py

@@ -1 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, with_statement
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db import connection, transaction
 from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
+from django.db.utils import DatabaseError
 from django.test import TransactionTestCase, skipUnlessDBFeature
+from django.test.utils import override_settings
 from django.utils.unittest import skipIf
 
 from .models import Mod, M2mA, M2mB
@@ -166 +168 @@
         except:
             self.fail("A transaction consisting of a failed operation was not closed.")
 
+        # Same test with DebugCursor
+        with override_settings(DEBUG=True):
+            self.assertRaises(Exception, create_system_user)
+            try:
+                self.assertEqual(User.objects.count(), 1)
+            except DatabaseError:
+                self.fail("A transaction consisting of a failed operation was not closed.")
+
 
 class TestManyToManyAddTransaction(TransactionTestCase):
     def test_manyrelated_add_commit(self):