Ticket #10517: include_belongs_to_with_inferred_foreign_key.patch

test/associations/eager_test.rb

@@ -115 +115 @@
-    assert_equal [2], posts.collect { |p| p.id }
-  end
-  
+  def test_eager_association_loading_with_belongs_to_inferred_foreign_key_from_association_name
+    author_favorite = AuthorFavorite.find(:first, :include => :favorite_author)
+    assert_equal authors(:mary), assert_no_queries { author_favorite.favorite_author }
+  end
+  
-  def test_eager_association_loading_with_explicit_join
-    posts = Post.find(:all, :include => :comments, :joins => "INNER JOIN authors ON posts.author_id = authors.id AND authors.name = 'Mary'", :limit => 1, :order => 'author_id')
-    assert_equal 1, posts.length

test/fixtures/author.rb

@@ -105 +105 @@
-
-class AuthorFavorite < ActiveRecord::Base
-  belongs_to :author
-, :foreign_key => 'favorite_author_id'
+
-end

lib/active_record/associations.rb

@@ -1707 +1707 @@
-                     connection.quote_table_name(aliased_table_name),
-                     reflection.klass.primary_key,
-                     connection.quote_table_name(parent.aliased_table_name),
-klass.to_s.foreign_key
+reflection.primary_key_name
-                    ]
-                else
-                  ""