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

Fixed #3024 -- Fixed database commit() and rollback() behaviour so it works 

consistently if you execute them before Django has made a database connection.
Thanks Bastian Kleineidam.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-03-09 07:55:40 +00:00
parent 8248569471
commit cc8d656569
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -112,6 +112,7 @@ answer newbie questions, and generally made Django that much better:
Garth Kidd <http://www.deadlybloodyserious.com/> Garth Kidd <http://www.deadlybloodyserious.com/>
kilian <kilian.cavalotti@lip6.fr> kilian <kilian.cavalotti@lip6.fr>
Sune Kirkeby <http://ibofobi.dk/> Sune Kirkeby <http://ibofobi.dk/>
Bastian Kleineidam <calvin@debian.org>
Cameron Knight (ckknight) Cameron Knight (ckknight)
Meir Kriheli <http://mksoft.co.il/> Meir Kriheli <http://mksoft.co.il/>
Bruce Kroeze <http://coderseye.com/> Bruce Kroeze <http://coderseye.com/>

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

@ -76,10 +76,11 @@ class DatabaseWrapper(local):
return cursor return cursor
def _commit(self): def _commit(self):
if self.connection is not None:
return self.connection.commit() return self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
return self.connection.rollback() return self.connection.rollback()
def close(self): def close(self):

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

@ -108,10 +108,11 @@ class DatabaseWrapper(local):
return cursor return cursor
def _commit(self): def _commit(self):
if self.connection is not None:
self.connection.commit() self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
try: try:
self.connection.rollback() self.connection.rollback()
except Database.NotSupportedError: except Database.NotSupportedError:

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

@ -43,10 +43,11 @@ class DatabaseWrapper(local):
return FormatStylePlaceholderCursor(self.connection) return FormatStylePlaceholderCursor(self.connection)
def _commit(self): def _commit(self):
if self.connection is not None:
self.connection.commit() self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
try: try:
self.connection.rollback() self.connection.rollback()
except Database.NotSupportedError: except Database.NotSupportedError:

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

@ -92,10 +92,11 @@ class DatabaseWrapper(local):
return cursor return cursor
def _commit(self): def _commit(self):
if self.connection is not None:
return self.connection.commit() return self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
return self.connection.rollback() return self.connection.rollback()
def close(self): def close(self):

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

@ -60,10 +60,11 @@ class DatabaseWrapper(local):
return cursor return cursor
def _commit(self): def _commit(self):
if self.connection is not None:
return self.connection.commit() return self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
return self.connection.rollback() return self.connection.rollback()
def close(self): def close(self):

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

@ -67,10 +67,11 @@ class DatabaseWrapper(local):
return cursor return cursor
def _commit(self): def _commit(self):
if self.connection is not None:
self.connection.commit() self.connection.commit()
def _rollback(self): def _rollback(self):
if self.connection: if self.connection is not None:
self.connection.rollback() self.connection.rollback()
def close(self): def close(self):