Ticket #10878: has_many_through_non_conventional_ids_fix.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
+  
+  create_table :pet_accessories, :primary_key => :pet_accessory_id, :force => true do |t|
+    t.string :name
+    t.integer :pet_id, :integer
+  end
-end

test/models/pet.rb

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

test/models/owner.rb

@@ +1 @@
+class Owner < ActiveRecord::Base
+  set_primary_key :owner_id
+  has_many :pets
+  has_many :pet_accessories, :through => :pets
+end

test/models/pet_accessory.rb

@@ +1 @@
+class PetAccessory < ActiveRecord::Base
+  set_primary_key :pet_accessory_id
+  belongs_to :pet
+end

test/fixtures/pet_accessories.yml

@@ +1 @@
+cracker:
+    pet_accessory_id: 1
+    pet_id: 1
+    name: cracker
+
+eyepatch:
+    pet_accessory_id: 2
+    pet_id: 1
+    name: eyepatch
+
+leash:
+    pet_accessory_id: 3
+    pet_id: 2
+    name: leash
+    
+collar:
+    pet_accessory_id: 4
+    pet_id: 3
+    name: collar
+    
+harness:
+    pet_accessory_id: 5
+    pet_id: 3
+    name: harness

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/join_model_test.rb

@@ -11 +11 @@
-require 'models/edge'
-require 'models/book'
-require 'models/citation'
+require 'models/owner'
+require 'models/pet'
+require 'models/pet_accessory'
-
-class AssociationsJoinModelTest < ActiveSupport::TestCase
-  self.use_transactional_fixtures = false
-
+, :owners, :pets, :pet_accessories
-
-  def test_has_many
-    assert authors(:david).categories.include?(categories(:general))
@@ -233 +236 @@
-      assert_equal posts[i].authors.length, assert_no_queries { posts_with_authors[i].authors.length }
-    end
-  end
+  
+  def test_include_has_many_through_non_conventional_primary_key
+    accessories = PetAccessory.find(:all, :order => 'pet_accessory_id', :conditions => {:pet_id => 1})
+    owner = Pet.find(1).owner
+    owner_accessories = owner.pet_accessories.find(:all,:order => 'pet_accessory_id')
+    assert_equal owner_accessories.length, accessories.length
+  end
-
-  def test_include_polymorphic_has_one
-    post    = Post.find_by_id(posts(:welcome).id, :include => :tagging)

lib/active_record/associations/has_many_through_association.rb

@@ -214 +214 @@
-            end
-          else
-            reflection_primary_key = @reflection.source_reflection.primary_key_name
-
+through_reflection.
-            if @reflection.source_reflection.options[:as]
-              polymorphic_join = "AND %s.%s = %s" % [
-                @reflection.quoted_table_name, "#{@reflection.source_reflection.options[:as]}_type",
@@ -222 +222 @@
-              ]
-            end
-          end
-
-          "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
-            @reflection.through_reflection.table_name,
-            @reflection.table_name, reflection_primary_key,