diff options
| author | claudiob <claudiob@gmail.com> | 2014-12-14 22:10:15 -0800 |
|---|---|---|
| committer | claudiob <claudiob@gmail.com> | 2015-01-02 15:31:56 -0800 |
| commit | bb78af73ab7e86fd9662e8810e346b082a1ae193 (patch) | |
| tree | eef33ea8ee271af92d621fe68155f169d51b5a65 /activerecord/lib/active_record/associations | |
| parent | 91b8129320522f664801f122daea4a7628db90a7 (diff) | |
| download | rails-bb78af73ab7e86fd9662e8810e346b082a1ae193.tar.gz rails-bb78af73ab7e86fd9662e8810e346b082a1ae193.tar.bz2 rails-bb78af73ab7e86fd9662e8810e346b082a1ae193.zip | |
Deprecate `false` as the way to halt AR callbacks
Before this commit, returning `false` in an ActiveRecord `before_` callback
such as `before_create` would halt the callback chain.
After this commit, the behavior is deprecated: will still work until
the next release of Rails but will also display a deprecation warning.
The preferred way to halt a callback chain is to explicitly `throw(:abort)`.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index d7f655d00c..2a782c06d0 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -17,7 +17,7 @@ module ActiveRecord unless empty? record = klass.human_attribute_name(reflection.name).downcase owner.errors.add(:base, :"restrict_dependent_destroy.many", record: record) - false + throw(:abort) end else diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 74b8c53758..41a75b820e 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -13,7 +13,7 @@ module ActiveRecord if load_target record = klass.human_attribute_name(reflection.name).downcase owner.errors.add(:base, :"restrict_dependent_destroy.one", record: record) - false + throw(:abort) end else |