test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a safety net for developers messing with autocommit.

This commit is contained in:
Aymeric Augustin 2013-03-07 14:47:50 +01:00
parent 107d9b1d97
commit 423c0d5e29
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,12 +417,19 @@ class BaseDatabaseWrapper(object):
or if it outlived its maximum age. or if it outlived its maximum age.
""" """
if self.connection is not None: if self.connection is not None:
# If the application didn't restore the original autocommit setting,
# don't take chances, drop the connection.
if self.autocommit != self.settings_dict['AUTOCOMMIT']:
self.close()
return
if self.errors_occurred: if self.errors_occurred:
if self.is_usable(): if self.is_usable():
self.errors_occurred = False self.errors_occurred = False
else: else:
self.close() self.close()
return return
if self.close_at is not None and time.time() >= self.close_at: if self.close_at is not None and time.time() >= self.close_at:
self.close() self.close()
return return