0
@@ -1974,7 +1974,7 @@ module ActiveRecord
0
                 @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join")
0
               end
0
         
0
-              if reflection.macro == :has_many && reflection.options[:through]
0
+              if [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through]
0
                 @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join")
0
               end
0
             end
0
@@ -1998,7 +1998,7 @@ module ActiveRecord
0
                      ]
0
                 when :has_many, :has_one
0
                   case
0
-                    when reflection.macro == :has_many && reflection.options[:through]
0
+                    when reflection.options[:through]
0
                       through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
0
 
0
                       jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil

0
@@ -75,4 +75,20 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
0
     assert_not_nil assert_no_queries {clubs[0].sponsored_member}
0
   end
0
 
0
+  def test_has_one_through_nonpreload_eagerloading
0
+    members = assert_queries(1) do
0
+      Member.find(:all, :include => :club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
0
+    end
0
+    assert_equal 1, members.size
0
+    assert_not_nil assert_no_queries {members[0].club}
0
+  end
0
+
0
+  def test_has_one_through_nonpreload_eager_loading_through_polymorphic
0
+    members = assert_queries(1) do
0
+      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
0
+    end
0
+    assert_equal 1, members.size
0
+    assert_not_nil assert_no_queries {members[0].sponsor_club}
0
+  end
0
+
0
 end