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

removed unnecessary mapping for on options

Browse source 
Right before that in `assert_valid_transaction_action` method we make
sure that `options[:on]` contains values from `ACTIONS` array
(`[:create, :destroy, :update]`) and nothing more (i.e. it could not
contain strings or something else, otherwise the error is raised).

Also I've polished some docs.
This commit is contained in:
Anton Kalyaev 2013-06-20 22:34:41 +04:00
parent 79abf07be8
commit 512f03e740
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,7 @@ module ActiveRecord
if options.is_a?(Hash) && options[:on] if options.is_a?(Hash) && options[:on]
assert_valid_transaction_action(options[:on]) assert_valid_transaction_action(options[:on])
options[:if] = Array(options[:if]) options[:if] = Array(options[:if])
fire_on = Array(options[:on]).map(&:to_sym) fire_on = Array(options[:on])
options[:if] << "transaction_include_any_action?(#{fire_on})" options[:if] << "transaction_include_any_action?(#{fire_on})"
end end
end end
@ -288,17 +288,17 @@ module ActiveRecord
clear_transaction_record_state clear_transaction_record_state
end end
# Call the after_commit callbacks # Call the +after_commit+ callbacks.
# #
# 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! #:nodoc: def committed! #:nodoc:
run_callbacks :commit if destroyed? || persisted? run_callbacks :commit if destroyed? || persisted?
ensure ensure
clear_transaction_record_state clear_transaction_record_state
end end
# Call the after rollback callbacks. The 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) #:nodoc: def rolledback!(force_restore_state = false) #:nodoc:
run_callbacks :rollback run_callbacks :rollback
@ -306,7 +306,7 @@ module ActiveRecord
restore_transaction_record_state(force_restore_state) restore_transaction_record_state(force_restore_state)
end end
# Add the record to the current transaction so that the :after_rollback and :after_commit callbacks # Add the record to the current transaction so that the +after_rollback+ and +after_commit+ callbacks
# can be called. # can be called.
def add_to_transaction def add_to_transaction
if self.class.connection.add_transaction_record(self) if self.class.connection.add_transaction_record(self)