Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #11451 from jetthoughts/11450_do_not_resave_destro…

…yed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb

Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
commit 1c2545a45537661c3b1e896dd93b87377a65eb31 1 parent 714cb5a
@senny senny authored rafaelfranca committed
View
2  activerecord/lib/active_record/autosave_association.rb
@@ -339,6 +339,8 @@ def save_collection_association(reflection)
end
records.each do |record|
+ next if record.destroyed?
+
saved = true
if autosave != false && (@new_record_before_save || record.new_record?)
View
7 activerecord/test/cases/autosave_association_test.rb
@@ -734,6 +734,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}") }
Please sign in to comment.
Something went wrong with that request. Please try again.