Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.9.1 - #transaction may wrongly end enclosing transaction #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

0.9.1 - #transaction may wrongly end enclosing transaction #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/rdbi/database.rb
View file
Open in desktop
Expand Up @@ -125,12 +125,15 @@ def disconnect
# for you.
#
def transaction(&block)
@in_transaction += 1
transaction_depth = (@in_transaction += 1)

begin
yield self
self.commit if @in_transaction > 0
# Only commit if user didn't already explicitly end the transaction
self.commit if @in_transaction == transaction_depth
rescue => e
self.rollback
# Only rollback if user didn't already explicitly end the transaction
self.rollback if @in_transaction == transaction_depth
raise e
ensure
@in_transaction -= 1 unless @in_transaction == 0
Expand Down