Update deadlock_retry plugin with latest upstream code.

2009-06-05 23:07:10 +00:00 · 2009-06-05 23:07:10 +00:00 · 2b9f430908
commit 2b9f430908
parent edcd4af496
2 changed files with 33 additions and 2 deletions
--- a/vendor/plugins/deadlock_retry/lib/deadlock_retry.rb
+++ b/vendor/plugins/deadlock_retry/lib/deadlock_retry.rb
@ -44,6 +44,7 @@ module DeadlockRetry
      begin
        transaction_without_deadlock_handling(*objects, &block)
      rescue ActiveRecord::StatementInvalid => error
+        raise unless connection.open_transactions.zero?
        if DEADLOCK_ERROR_MESSAGES.any? { |msg| error.message =~ /#{Regexp.escape(msg)}/ }
          raise if retry_count >= MAXIMUM_RETRIES_ON_DEADLOCK
          retry_count += 1