diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-12 18:09:48 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-12 18:09:48 -0300 |
| commit | 34a068d053c7268caad78d4f1f90ab0e2a38682f (patch) | |
| tree | b991236ba7b29ed4a44d4cb0b79c09c2185f4242 /activerecord/lib/active_record/associations.rb | |
| parent | a924b2f66e955dcc82b691ca5e48ef5b84035286 (diff) | |
| parent | 54a5446641e4386285231385700b95a223931bff (diff) | |
| download | rails-34a068d053c7268caad78d4f1f90ab0e2a38682f.tar.gz rails-34a068d053c7268caad78d4f1f90ab0e2a38682f.tar.bz2 rails-34a068d053c7268caad78d4f1f90ab0e2a38682f.zip | |
Leave the quoting part to ARel
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 4ed0cb70e9..29f58a04e6 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| |