diff options
| author | claudiob <claudiob@gmail.com> | 2014-10-16 16:21:24 -0700 |
|---|---|---|
| committer | claudiob <claudiob@gmail.com> | 2015-01-02 15:31:55 -0800 |
| commit | 2386daabe7f8c979b453010dc0de3e1f6bbf859d (patch) | |
| tree | 74ab7a4ffc32cda7126e3ce8950d21af0c4c4b90 /activerecord/lib/active_record | |
| parent | 93dd5028a0cd0363d9f4bfc97d9ce70f0f3e88c8 (diff) | |
| download | rails-2386daabe7f8c979b453010dc0de3e1f6bbf859d.tar.gz rails-2386daabe7f8c979b453010dc0de3e1f6bbf859d.tar.bz2 rails-2386daabe7f8c979b453010dc0de3e1f6bbf859d.zip | |
Throw :abort halts default CallbackChains
This commit changes arguments and default value of CallbackChain's :terminator
option.
After this commit, Chains of callbacks defined **without** an explicit
`:terminator` option will be halted as soon as a `before_` callback throws
`:abort`.
Chains of callbacks defined **with** a `:terminator` option will maintain their
existing behavior of halting as soon as a `before_` callback matches the
terminator's expectation. For instance, ActiveModel's callbacks will still
halt the chain when a `before_` callback returns `false`.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index de701edca0..95e9a8646e 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -17,7 +17,7 @@ module ActiveRecord included do define_callbacks :commit, :rollback, - terminator: ->(_, result) { result == false }, + terminator: ->(_, result_lambda) { result_lambda.call == false }, scope: [:kind, :name] mattr_accessor :raise_in_transactional_callbacks, instance_writer: false |