kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #36142 from kamipo/should_take_first_record_state

Browse source 
Should take the record's state of first action in the transaction
This commit is contained in:
Ryuta Kamizono 2019-04-30 22:43:29 +09:00 committed by GitHub
commit 7575242e83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
activerecord/lib/active_record/transactions.rb
View file

@ -333,7 +333,7 @@ module ActiveRecord
# Ensure that it is not called if the object was never persisted (failed create), # Ensure that it is not called if the object was never persisted (failed create),
# but call it after the commit of a destroyed object. # but call it after the commit of a destroyed object.
def committed!(should_run_callbacks: true) #:nodoc: def committed!(should_run_callbacks: true) #:nodoc:
if should_run_callbacks && (destroyed? || persisted?) if should_run_callbacks && trigger_transactional_callbacks?
@_committed_already_called = true @_committed_already_called = true
_run_commit_without_transaction_enrollment_callbacks _run_commit_without_transaction_enrollment_callbacks
_run_commit_callbacks _run_commit_callbacks
@ -346,7 +346,7 @@ module ActiveRecord
# Call the #after_rollback callbacks. The +force_restore_state+ argument indicates if the record # Call the #after_rollback callbacks. The +force_restore_state+ argument indicates if the record
# state should be rolled back to the beginning or just to the last savepoint. # state should be rolled back to the beginning or just to the last savepoint.
def rolledback!(force_restore_state: false, should_run_callbacks: true) #:nodoc: def rolledback!(force_restore_state: false, should_run_callbacks: true) #:nodoc:
if should_run_callbacks if should_run_callbacks && trigger_transactional_callbacks?
_run_rollback_callbacks _run_rollback_callbacks
_run_rollback_without_transaction_enrollment_callbacks _run_rollback_without_transaction_enrollment_callbacks
end end
@ -364,7 +364,9 @@ module ActiveRecord
def with_transaction_returning_status def with_transaction_returning_status
status = nil status = nil
self.class.transaction do self.class.transaction do
unless has_transactional_callbacks? if has_transactional_callbacks?
add_to_transaction
else
sync_with_transaction_state if @transaction_state&.finalized? sync_with_transaction_state if @transaction_state&.finalized?
@transaction_state = self.class.connection.transaction_state @transaction_state = self.class.connection.transaction_state
end end
@ -372,11 +374,6 @@ module ActiveRecord
status = yield status = yield
raise ActiveRecord::Rollback unless status raise ActiveRecord::Rollback unless status
ensure
if has_transactional_callbacks? &&
(@_new_record_before_last_commit && !new_record? || _trigger_update_callback || _trigger_destroy_callback)
add_to_transaction
end
end end
status status
end end
@ -460,6 +457,10 @@ module ActiveRecord
self.class.connection.add_transaction_record(self) self.class.connection.add_transaction_record(self)
end end
def trigger_transactional_callbacks?
@_new_record_before_last_commit && !new_record? || _trigger_update_callback || _trigger_destroy_callback
end
def has_transactional_callbacks? def has_transactional_callbacks?
!_rollback_callbacks.empty? || !_commit_callbacks.empty? || !_before_commit_callbacks.empty? !_rollback_callbacks.empty? || !_commit_callbacks.empty? || !_before_commit_callbacks.empty?
end end

2
activerecord/test/cases/transaction_callbacks_test.rb
View file

@ -36,6 +36,8 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
has_many :replies, class_name: "ReplyWithCallbacks", foreign_key: "parent_id" has_many :replies, class_name: "ReplyWithCallbacks", foreign_key: "parent_id"
before_destroy { self.class.find(id).touch if persisted? }
before_commit { |record| record.do_before_commit(nil) } before_commit { |record| record.do_before_commit(nil) }
after_commit { |record| record.do_after_commit(nil) } after_commit { |record| record.do_after_commit(nil) }
after_save_commit { |record| record.do_after_commit(:save) } after_save_commit { |record| record.do_after_commit(:save) }