@@ -1815,7 +1815,7 @@ module ActiveRecord @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join") end - if reflection.macro == :has_many && reflection.options[:through] + if [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through] @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join") end end @@ -1839,7 +1839,7 @@ module ActiveRecord ] when :has_many, :has_one case - when reflection.macro == :has_many && reflection.options[:through] + when reflection.options[:through] through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : '' jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil activerecord/lib/active_record/associations.rb @@ -75,4 +75,20 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase assert_not_nil assert_no_queries {clubs[0].sponsored_member} end + def test_has_one_through_nonpreload_eagerloading + members = assert_queries(1) do + Member.find(:all, :include => :club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback + end + assert_equal 1, members.size + assert_not_nil assert_no_queries {members[0].club} + end + + def test_has_one_through_nonpreload_eager_loading_through_polymorphic + members = assert_queries(1) do + Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback + end + assert_equal 1, members.size + assert_not_nil assert_no_queries {members[0].sponsor_club} + end + end activerecord/test/cases/associations/has_one_through_associations_test.rb fdeeeaea61bb34040f8da03afa9876171db4b17e Frederick Cheung frederick.cheung@gmail.com http://github.com/rails/rails/commit/bff0f5fb6d95c8f844fd6e081f827801df20114c bff0f5fb6d95c8f844fd6e081f827801df20114c 2008-08-25T21:25:24-07:00 2008-08-25T15:20:10-07:00 Implement old-skool eagerloading for has_one :through Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> c4f0a70ce9fee628c896ab2777dfb41412734807 Jeremy Kemper jeremy@bitsweat.net