kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "save on parent should not cascade to child unless child changed [#3353 state:open]"

Browse source 
Please check Lighthouse for more information.

This reverts commit 4a0d7c1a43.
This commit is contained in:
José Valim 2010-07-21 14:44:46 +02:00
parent 96b2516c3c
commit 01add55d6a
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/autosave_association.rb
View file

@ -372,9 +372,7 @@ module ActiveRecord
if autosave && association.marked_for_destruction?
association.destroy
elsif autosave != false
if association.new_record? || ( autosave && association.changed? )
saved = association.save(:validate => !autosave)
end
saved = association.save(:validate => !autosave) if association.new_record? || autosave
if association.updated?
association_id = association.send(reflection.options[:primary_key] || :id)

18
activerecord/test/cases/autosave_association_test.rb
View file

@ -632,8 +632,6 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
end
def test_should_rollback_destructions_if_an_exception_occurred_while_saving_a_parent
#association save method only trigged when association is changed
@ship.pirate.catchphrase = "new catch phrase"
# Stub the save method of the @ship.pirate instance to destroy and then raise an exception
class << @ship.pirate
def save(*args)
@ -882,22 +880,6 @@ class TestAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase
@pirate = @ship.create_pirate(:catchphrase => "Don' botharrr talkin' like one, savvy?")
end
def test_should_not_call_belongs_to_after_save_callbacks_if_no_changes
@ship.attributes = { :name => "Titanic", :pirate_attributes => {:id => @pirate.id} }
#here there are no changes to pirate so if save on ship causes save on pirate
#this callback will fail pirate save.(pirate save shouldn't happen)
@ship.pirate.cancel_save_from_callback = true
@ship.save
assert_equal 'Titanic', @ship.reload.name
end
def test_should_call_belongs_to_save_if_belongs_to_has_changes
@ship.attributes = { :name => "Titanic", :pirate_attributes => { :catchphrase => 'Jack', :id => @pirate.id} }
@ship.save
assert_equal 'Titanic', @ship.reload.name
assert_equal 'Jack', @pirate.reload.catchphrase
end
def test_should_still_work_without_an_associated_model
@pirate.destroy
@ship.reload.name = "The Vile Insanity"