aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorBrian Thomas Storti <btstorti@gmail.com>2013-11-23 09:24:52 -0200
committerBrian Thomas Storti <btstorti@gmail.com>2013-11-25 19:30:07 -0200
commit5aab0c053832ded70a3a4b58cb97f8f8bba796ba (patch)
tree6f10893ea925ca124b7c57c6fb0cdb0073759f03 /activerecord/lib
parent19dd2166103cc1d39d7346714c46f32191958981 (diff)
downloadrails-5aab0c053832ded70a3a4b58cb97f8f8bba796ba.tar.gz
rails-5aab0c053832ded70a3a4b58cb97f8f8bba796ba.tar.bz2
rails-5aab0c053832ded70a3a4b58cb97f8f8bba796ba.zip
Raise `RecordNotDestroyed` when children can't be replaced
Fixes #12812 Raise `ActiveRecord::RecordNotDestroyed` when a child marked with `dependent: destroy` can't be destroyed. The following code: ```ruby class Post < ActiveRecord::Base has_many :comments, dependent: :destroy end class Comment < ActiveRecord::Base before_destroy do return false end end post = Post.create!(comments: [Comment.create!]) post.comments = [Comment.create!] ```` would result in a `post` with two `comments`. With this commit, the same code would raise a `RecordNotDestroyed` exception, keeping the `post` with the same `comment`.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/has_many_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 0a23109b9b..72e0891702 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -108,7 +108,7 @@ module ActiveRecord
# Deletes the records according to the <tt>:dependent</tt> option.
def delete_records(records, method)
if method == :destroy
- records.each { |r| r.destroy }
+ records.each(&:destroy!)
update_counter(-records.length) unless inverse_updates_counter_cache?
else
if records == :all