diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-21 23:40:20 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-21 23:40:20 +0000 |
| commit | 1facce6c244713bb88e4ed70222f0d42b30736de (patch) | |
| tree | 142f45fc3e4a9f9111d8206ea9276520fdc1ee83 /activerecord/lib/active_record | |
| parent | 13cd6135cdb50d897441dfa4d1572311632ab924 (diff) | |
| download | rails-1facce6c244713bb88e4ed70222f0d42b30736de.tar.gz rails-1facce6c244713bb88e4ed70222f0d42b30736de.tar.bz2 rails-1facce6c244713bb88e4ed70222f0d42b30736de.zip | |
allow has_many :through to work with custom :foreign key (closes #3422) [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3456 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 | 3 |
1 files changed, 1 insertions, 2 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 d3b6707e36..de0854a8cd 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -62,7 +62,6 @@ module ActiveRecord def construct_conditions through_reflection = @owner.class.reflections[@reflection.options[:through]] - through_foreign_classname = ActiveRecord::Base.send(:class_name_of_active_record_descendant, @owner.class).to_s if through_reflection.options[:as] conditions = @@ -72,7 +71,7 @@ module ActiveRecord else conditions = "#{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{through_reflection.table_name}.#{@reflection.klass.to_s.foreign_key} " + - "AND #{through_reflection.table_name}.#{through_foreign_classname.foreign_key} = #{@owner.quoted_id}" + "AND #{through_reflection.table_name}.#{through_reflection.primary_key_name} = #{@owner.quoted_id}" end conditions << " AND (#{interpolate_sql(sanitize_sql(@reflection.options[:conditions]))})" if @reflection.options[:conditions] |