diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-02 03:27:31 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-02 03:27:31 +0000 |
commit | b1ea27630df0f0639900b321d756091b42ed29f7 (patch) | |
tree | 4372f5dc041745269ebba322ba6dd902b43792f6 /activerecord/lib/active_record | |
parent | 9d79e0668d6a51573170ee568c5bac6717ec1a0c (diff) | |
download | rails-b1ea27630df0f0639900b321d756091b42ed29f7.tar.gz rails-b1ea27630df0f0639900b321d756091b42ed29f7.tar.bz2 rails-b1ea27630df0f0639900b321d756091b42ed29f7.zip |
Fix has_many :through a polymorphic has_many. Closes #10529 [Aleksey Kondratenko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 |
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 96d0b73da2..06ea5d1d1c 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -212,7 +212,7 @@ module ActiveRecord def construct_joins(custom_joins = nil) polymorphic_join = nil - if @reflection.through_reflection.options[:as] || @reflection.source_reflection.macro == :belongs_to + if @reflection.source_reflection.macro == :belongs_to reflection_primary_key = @reflection.klass.primary_key source_primary_key = @reflection.source_reflection.primary_key_name if @reflection.options[:source_type] |