@@ -19,6 +19,7 @@ module DBI # since we need to thread protect the AutoCommit property of the # database handle. def one_transaction + exception = nil @mutex.synchronize do # Keep track of transactions for debugging purposes trans = { :time => ::Time.now, :stack => caller } @@ -26,14 +27,22 @@ module DBI auto_commit = self[ 'AutoCommit' ] self[ 'AutoCommit' ] = false - result = transaction do - yield self + result = nil + begin + result = transaction do + yield self + end + rescue Exception => e + exception = e end self[ 'AutoCommit' ] = auto_commit @transactions.delete trans result end + if exception + raise exception + end end def select_column( statement, *bindvars ) lib/m4dbi/database-handle.rb 6c228a7b4ee29efe09df5d8e6c03a6224aadd9d3 Pistos gitsomegrace.5.pistos@geoshell.com http://github.com/Pistos/m4dbi/commit/59c44877e90696a9f808cc2b730c5d0dae3a76a4 59c44877e90696a9f808cc2b730c5d0dae3a76a4 2009-07-16T21:44:19-07:00 2009-07-16T21:44:19-07:00 In one_transaction, handle exceptions in the transaction. Make sure exceptions don't get in the way of properly cleaning up. ed00b9786c744c51d7da81ae4cb95a3bcc13b29b Pistos gitsomegrace.5.pistos@geoshell.com