mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-02-04 14:37:19 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #6669 -- Ensured database connections are marked as dirty by CursorDebugWrapper.execute/executemany. Refs #9964. Thanks james at 10gic net for the report and Claude Paroz for the patch.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-01-12 21:55:19 +00:00
parent e1ba9111ac
commit 30c846bf3d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/backends/util.py
View File

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

8
tests/regressiontests/transactions_regress/tests.py
View File

@ -4,6 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.db import connection, transaction from django.db import connection, transaction
from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
from django.test import TransactionTestCase, skipUnlessDBFeature from django.test import TransactionTestCase, skipUnlessDBFeature
from django.test.utils import override_settings
from django.utils.unittest import skipIf from django.utils.unittest import skipIf
from .models import Mod, M2mA, M2mB from .models import Mod, M2mA, M2mB
@ -166,6 +167,13 @@ class TestTransactionClosing(TransactionTestCase):
except: except:
self.fail("A transaction consisting of a failed operation was not closed.") self.fail("A transaction consisting of a failed operation was not closed.")
@override_settings(DEBUG=True)
def test_failing_query_transaction_closed_debug(self):
"""
Regression for #6669. Same test as above, with DEBUG=True.
"""
self.test_failing_query_transaction_closed()
class TestManyToManyAddTransaction(TransactionTestCase): class TestManyToManyAddTransaction(TransactionTestCase):
def test_manyrelated_add_commit(self): def test_manyrelated_add_commit(self):