aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_many_through_association.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-03-05 11:34:39 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-03-05 11:34:39 +0000
commit0e8c3b8dd974a19855f41cb319579567449461ed (patch)
treef270237dcffab0ddc4c867fc74c2f441312de72a /activerecord/lib/active_record/associations/has_many_through_association.rb
parentdf57f53d09575f8bc6542f87a3384240b66f9b4b (diff)
downloadrails-0e8c3b8dd974a19855f41cb319579567449461ed.tar.gz
rails-0e8c3b8dd974a19855f41cb319579567449461ed.tar.bz2
rails-0e8c3b8dd974a19855f41cb319579567449461ed.zip
Fix has_many :through << with custom foreign keys. Closes #6466, #7153.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6336 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_through_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_many_through_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index ce22496e6d..26559d523a 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -138,7 +138,7 @@ module ActiveRecord
# Construct attributes for :through pointing to owner and associate.
def construct_join_attributes(associate)
- construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.association_foreign_key => associate.id)
+ construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.primary_key_name => associate.id)
end
# Associate attributes pointing to owner, quoted.