@@ -229,7 +229,7 @@ module ActiveRecord options = reflection.options primary_key_name = reflection.through_reflection_primary_key_name - id_to_record_map, ids = construct_id_map(records, primary_key_name) + id_to_record_map, ids = construct_id_map(records, primary_key_name || reflection.options[:primary_key]) records.each {|record| record.send(reflection.name).loaded} if options[:through] activerecord/lib/active_record/association_preload.rb @@ -2171,7 +2171,7 @@ module ActiveRecord aliased_table_name, foreign_key, parent.aliased_table_name, - parent.primary_key + reflection.options[:primary_key] || parent.primary_key ] end when :belongs_to activerecord/lib/active_record/associations.rb @@ -786,4 +786,21 @@ class EagerAssociationTest < ActiveRecord::TestCase assert_equal Person.find(person.id).agents, person.agents end end + + def test_preload_has_many_using_primary_key + expected = Firm.find(:first).clients_using_primary_key.to_a + firm = Firm.find :first, :include => :clients_using_primary_key + assert_no_queries do + assert_equal expected, firm.clients_using_primary_key + end + end + + def test_include_has_many_using_primary_key + expected = Firm.find(1).clients_using_primary_key.sort_by &:name + firm = Firm.find 1, :include => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies.name' + assert_no_queries do + assert_equal expected, firm.clients_using_primary_key + end + end + end activerecord/test/cases/associations/eager_test.rb f4f8923cf0ef5bd31f9e98cecf4603d0c4bde296 Frederick Cheung fcheung frederick.cheung@gmail.com http://github.com/rails/rails/commit/7db1704068b86fb2212388b14b4963526bacfa5d 7db1704068b86fb2212388b14b4963526bacfa5d 2008-12-26T15:17:56-08:00 2008-12-26T14:53:07-08:00 Fix :include of has_many associations with :primary_key option 615165073929beb1f1c0ad67fd8f146446ac2c56 Frederick Cheung fcheung frederick.cheung@gmail.com