diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 18:03:43 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 18:03:43 +0000 |
commit | a32a9863640dbd7a74b251e5467f90d134396110 (patch) | |
tree | 9749cf28832ec403227a8dc92bf06e336bfb5a58 /activerecord/lib/active_record/associations/has_one_association.rb | |
parent | b230004897770ff8e29590263ddd6416b728af3a (diff) | |
download | rails-a32a9863640dbd7a74b251e5467f90d134396110.tar.gz rails-a32a9863640dbd7a74b251e5467f90d134396110.tar.bz2 rails-a32a9863640dbd7a74b251e5467f90d134396110.zip |
save polymorphic joins from the has_many|one association (closes #3812) [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3586 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 4dbc0f6441..d07323a869 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -42,8 +42,7 @@ module ActiveRecord @target = nil else raise_on_type_mismatch(obj) - - obj[@reflection.primary_key_name] = @owner.id unless @owner.new_record? + set_belongs_to_association_for(obj) @target = (AssociationProxy === obj ? obj.target : obj) end |