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

has_one :through should not create a new association when assigned nil [#698 state:resolved]

Browse source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
Daniel Guettler 2009-05-17 14:48:20 +02:00 committed by Pratik Naik
parent a9e8c4b374
commit 25724eede9
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/associations/has_one_through_association.rb
View file

@ -8,9 +8,9 @@ module ActiveRecord
current_object = @owner.send(@reflection.through_reflection.name) current_object = @owner.send(@reflection.through_reflection.name)
if current_object if current_object
current_object.update_attributes(construct_join_attributes(new_value)) new_value ? current_object.update_attributes(construct_join_attributes(new_value)) : current_object.destroy
else else
@owner.send(@reflection.through_reflection.name, klass.send(:create, construct_join_attributes(new_value))) @owner.send(@reflection.through_reflection.name, klass.send(:create, construct_join_attributes(new_value))) if new_value
end end
end end

7
activerecord/test/cases/associations/has_one_through_associations_test.rb
View file

@ -44,6 +44,13 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
end end
end end
def test_set_record_to_nil_should_delete_association
@member.club = nil
@member.reload
assert_equal nil, @member.current_membership
assert_nil @member.club
end
def test_has_one_through_polymorphic def test_has_one_through_polymorphic
assert_equal clubs(:moustache_club), @member.sponsor_club assert_equal clubs(:moustache_club), @member.sponsor_club
end end