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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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