allow raise after explicit rollback within #transaction(&block)

This commit is contained in:
Brian J. Cardiff 2016-12-14 11:37:49 -03:00
parent dc26498948
commit ed3ed71501
2 changed files with 21 additions and 10 deletions

View file

@ -111,6 +111,26 @@ describe DB::Transaction do
end
end
it "transaction can be rolledback within block and later raise" do
with_dummy_connection do |cnn|
expect_raises(FooException) do
cnn.transaction do |tx|
tx.rollback
raise FooException.new
end
end
end
end
it "transaction can be rolledback within block and later raise DB::Rollback without forwarding it" do
with_dummy_connection do |cnn|
cnn.transaction do |tx|
tx.rollback
raise DB::Rollback.new
end
end
end
it "transaction can't be committed twice" do
with_dummy_connection do |cnn|
cnn.transaction do |tx|

View file

@ -7,16 +7,7 @@ module DB
begin
yield tx
rescue e
# TODO check if `unless tx.closed?` should be added.
# If it is not added, when an exception occurs after the
# transaction is closed (explicit rollback/commit)
# the call to rollback will trigger an exception.
# Since the code will be in between `#transaction(&block)`
# seems reasonable to raise an error since it might trigger
# a design flaw. Transaction might been commited already.
# Maybe we should wrap e in another exception that clarifies
# this scenario.
tx.rollback
tx.rollback unless tx.closed?
raise e unless e.is_a?(DB::Rollback)
else
tx.commit unless tx.closed?