From 54a5446641e4386285231385700b95a223931bff Mon Sep 17 00:00:00 2001 From: Adam Milligan Date: Sun, 10 May 2009 16:20:16 -0700 Subject: HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. [#1642 state:committed] Signed-off-by: Jeremy Kemper --- activerecord/lib/active_record/associations.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'activerecord/lib/active_record/associations.rb') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 157716a477..10ecd068d3 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1242,13 +1242,8 @@ module ActiveRecord association = association_proxy_class.new(self, reflection) end - if association_proxy_class == HasOneThroughAssociation - association.create_through_record(new_value) - self.send(reflection.name, new_value) - else - association.replace(new_value) - association_instance_set(reflection.name, new_value.nil? ? nil : association) - end + association.replace(new_value) + association_instance_set(reflection.name, new_value.nil? ? nil : association) end define_method("set_#{reflection.name}_target") do |target| -- cgit v1.2.3