Skip to content

ActiveRecord integrations now using transactions respecting "use_transactions" config #1

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

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

ActiveRecord integrations now using transactions respecting "use_transactions" config #1

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/state_machine/integrations/active_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,11 +525,15 @@ def attribute_column
# an ActiveRecord::Rollback exception if the yielded block fails
# (i.e. returns false).
def transaction(object)
result = nil
object.class.transaction do
raise ::ActiveRecord::Rollback unless result = yield
if object.class.state_machines[name].use_transactions
result = nil
object.class.transaction do
raise ::ActiveRecord::Rollback unless result = yield
end
result
else
yield
end
result
end

# Defines a new named scope with the given name
Expand Down