Skip to content
Browse files

Merge pull request #11096 from akalyaev/remove-unnecessary-mapping

removed unnecessary mapping for on options
  • Loading branch information...
2 parents da8cb2a + 512f03e commit 7451bfc5a76764c2f188320eef0369dc97d22120 @carlosantoniodasilva carlosantoniodasilva committed Jun 25, 2013
Showing with 5 additions and 5 deletions.
  1. +5 −5 activerecord/lib/active_record/transactions.rb
View
10 activerecord/lib/active_record/transactions.rb
@@ -245,7 +245,7 @@ def set_options_for_callbacks!(args)
if options.is_a?(Hash) && options[:on]
assert_valid_transaction_action(options[:on])
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})"
end
end
@@ -288,25 +288,25 @@ def rollback_active_record_state!
clear_transaction_record_state
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),
- # but call it after the commit of a destroyed object
+ # but call it after the commit of a destroyed object.
def committed! #:nodoc:
run_callbacks :commit if destroyed? || persisted?
ensure
clear_transaction_record_state
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.
def rolledback!(force_restore_state = false) #:nodoc:
run_callbacks :rollback
ensure
restore_transaction_record_state(force_restore_state)
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.
def add_to_transaction
if self.class.connection.add_transaction_record(self)

0 comments on commit 7451bfc

Please sign in to comment.
Something went wrong with that request. Please try again.