p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.6.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit. 

Refs #21202.

Backport of 3becac84 from master
This commit is contained in:
Aymeric Augustin 2014-03-23 23:09:26 +01:00
parent 9afedbef42
commit 746cded010
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/mysql/base.py
View File

@ -457,7 +457,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
pass pass
def _set_autocommit(self, autocommit): def _set_autocommit(self, autocommit):
self.connection.autocommit(autocommit) with self.wrap_database_errors:
self.connection.autocommit(autocommit)
def disable_constraint_checking(self): def disable_constraint_checking(self):
""" """

3
django/db/backends/oracle/base.py
View File

@ -625,7 +625,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
pass pass
def _set_autocommit(self, autocommit): def _set_autocommit(self, autocommit):
self.connection.autocommit = autocommit with self.wrap_database_errors:
self.connection.autocommit = autocommit
def check_constraints(self, table_names=None): def check_constraints(self, table_names=None):
""" """

15
django/db/backends/postgresql_psycopg2/base.py
View File

@ -169,14 +169,15 @@ class DatabaseWrapper(BaseDatabaseWrapper):
self.connection.set_isolation_level(isolation_level) self.connection.set_isolation_level(isolation_level)
def _set_autocommit(self, autocommit): def _set_autocommit(self, autocommit):
if self.psycopg2_version >= (2, 4, 2): with self.wrap_database_errors:
self.connection.autocommit = autocommit if self.psycopg2_version >= (2, 4, 2):
else: self.connection.autocommit = autocommit
if autocommit:
level = psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT
else: else:
level = self.isolation_level if autocommit:
self.connection.set_isolation_level(level) level = psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT
else:
level = self.isolation_level
self.connection.set_isolation_level(level)
def check_constraints(self, table_names=None): def check_constraints(self, table_names=None):
""" """

3
django/db/backends/sqlite3/base.py
View File

@ -387,7 +387,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
level = '' level = ''
# 'isolation_level' is a misleading API. # 'isolation_level' is a misleading API.
# SQLite always runs at the SERIALIZABLE isolation level. # SQLite always runs at the SERIALIZABLE isolation level.
self.connection.isolation_level = level with self.wrap_database_errors:
self.connection.isolation_level = level
def check_constraints(self, table_names=None): def check_constraints(self, table_names=None):
""" """