[SQL-CVS] SQLObject/SQLObject DBConnection.py,1.57,1.58

[<ian...@us...>]

Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv18229/SQLObject

Modified Files:
	DBConnection.py 
Log Message:
Release connection after database error
(patch from Ken Kinder <ke...@ke...>)


Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** DBConnection.py	4 Dec 2003 16:44:04 -0000	1.57
--- DBConnection.py	16 Dec 2003 05:41:11 -0000	1.58
***************
*** 71,76 ****
      def _runWithConnection(self, meth, *args):
          conn = self.getConnection()
!         val = meth(conn, *args)
!         self.releaseConnection(conn)
          return val
  
--- 71,78 ----
      def _runWithConnection(self, meth, *args):
          conn = self.getConnection()
!         try:
!             val = meth(conn, *args)
!         finally:
!             self.releaseConnection(conn)
          return val
  
***************
*** 905,914 ****
          except kinterbasdb.ProgrammingError:
              pass
-         val = meth(conn, *args)
          try:
!             conn.commit()
!         except kinterbasdb.ProgrammingError:
!             pass
!         self.releaseConnection(conn)
          return val
  
--- 907,918 ----
          except kinterbasdb.ProgrammingError:
              pass
          try:
!             val = meth(conn, *args)
!             try:
!                 conn.commit()
!             except kinterbasdb.ProgrammingError:
!                 pass
!         finally:
!             self.releaseConnection(conn)
          return val