Browse files

Do not re-save destroyed association on saving parent object

Closes #11450
  • Loading branch information...
1 parent 0b61cc7 commit 372e809667b37f11e232a762815211601859b8b5 @pftg pftg committed Jul 15, 2013
View
1 activerecord/lib/active_record/autosave_association.rb
@@ -343,6 +343,7 @@ def save_collection_association(reflection)
end
records.each do |record|
+ next if record.destroyed?
saved = true
View
7 activerecord/test/cases/autosave_association_test.rb
@@ -705,6 +705,13 @@ def test_should_destroy_has_many_as_part_of_the_save_transaction_if_they_were_ma
ids.each { |id| assert_nil klass.find_by_id(id) }
end
+ def test_should_not_resave_destroyed_association
+ @pirate.birds.create!(name: :parrot)
+ @pirate.birds.first.destroy
+ @pirate.save!
+ assert @pirate.reload.birds.empty?
+ end
+
def test_should_skip_validation_on_has_many_if_marked_for_destruction
2.times { |i| @pirate.birds.create!(:name => "birds_#{i}") }

0 comments on commit 372e809

Please sign in to comment.