Ticket #9640: fix_belongs_to_with_foreign_key.patch

test/schema/schema.rb

@@ -355 +355 @@
-  create_table 'warehouse-things', :force => true do |t|
-    t.integer :value
-  end
+
+  create_table :owners, :primary_key => :owner_id ,:force => true do |t|
+    t.string :name
+  end
+  
+  create_table :pets, :primary_key => :pet_id ,:force => true do |t|
+    t.string :name
+    t.integer :owner_id, :integer
+  end
+  
-end

test/models/pet.rb

@@ +1 @@
+class Pet < ActiveRecord::Base
+  set_primary_key :pet_id
+  belongs_to :owner
+end

test/models/owner.rb

@@ +1 @@
+class Owner < ActiveRecord::Base
+  set_primary_key :owner_id
+  has_many :pets
+end

test/fixtures/pets.yml

@@ +1 @@
+parrot:
+    pet_id: 1
+    name: parrot
+    owner_id: 1
+
+chew:
+    pet_id: 2
+    name: chew
+    owner_id: 2
+    
+mochi:
+    pet_id: 3
+    name: mochi
+    owner_id: 2

test/fixtures/owners.yml

@@ +1 @@
+blackbeard:
+    owner_id: 1
+    name: blackbeard
+
+ashley:
+    owner_id: 2
+    name: ashley

test/cases/associations/eager_test.rb

@@ -7 +7 @@
-require 'models/company'
-require 'models/person'
-require 'models/reader'
+require 'models/owner'
+require 'models/pet'
-
-class EagerAssociationTest < ActiveSupport::TestCase
-  fixtures :posts, :comments, :authors, :categories, :categories_posts,
-
+
+
-
-  def test_loading_with_one_association
-    posts = Post.find(:all, :include => :comments)
@@ -73 +76 @@
-    assert_nil Post.find(posts(:authorless).id, :include => :author).author
-  end
-
+  def test_eager_association_loading_with_belongs_to_and_foreign_keys
+    pets = Pet.find(:all, :include => :owner)
+    assert_equal 3, pets.length
+  end
+
-  def test_eager_association_loading_with_belongs_to
-    comments = Comment.find(:all, :include => :post)
-    assert_equal 10, comments.length

lib/active_record/association_preload.rb

@@ -180 +180 @@
-          klass = klass_name.constantize
-
-          table_name = klass.table_name
+          primary_key = klass.primary_key
-          conditions = "#{table_name}.#{primary_key} IN (?)"
-          conditions << append_conditions(options, preload_options)
-          associated_records = klass.find(:all, :conditions => [conditions, id_map.keys.uniq],
@@ -187 +188 @@
-                                          :select => options[:select],
-                                          :joins => options[:joins],
-                                          :order => options[:order])
-'id'
+primary_key
-        end
-      end
-