Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3954 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

5 files changed, 9 insertions, 0 deletions

diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index 7395aa5739..79ac19ec61 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -39,6 +39,11 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
     assert_equal tags(:general), posts(:welcome).tags.first
   end
 
+  def test_polymorphic_has_many_going_through_join_model_with_custom_foreign_key
+    assert_equal tags(:misc), taggings(:welcome_general).super_tag
+    assert_equal tags(:misc), posts(:welcome).super_tags.first
+  end
+
   def test_polymorphic_has_many_create_model_with_inheritance_and_custom_base_class
     post = SubStiPost.create :title => 'SubStiPost', :body => 'SubStiPost body'
     assert_instance_of SubStiPost, post
diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb
index 53aa7c1967..efe9cb35ab 100644
--- a/activerecord/test/fixtures/db_definitions/schema.rb
+++ b/activerecord/test/fixtures/db_definitions/schema.rb
@@ -2,6 +2,7 @@ ActiveRecord::Schema.define do
 
   create_table :taggings, :force => true do |t|
     t.column :tag_id, :integer
+    t.column :super_tag_id, :integer
     t.column :taggable_type, :string
     t.column :taggable_id, :integer
   end
diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb
index a00fd80671..9456582729 100644
--- a/activerecord/test/fixtures/post.rb
+++ b/activerecord/test/fixtures/post.rb
@@ -22,6 +22,7 @@ class Post < ActiveRecord::Base
 
   has_many :taggings, :as => :taggable
   has_many :tags, :through => :taggings
+  has_many :super_tags, :through => :taggings
 
   has_one :tagging, :as => :taggable
 
diff --git a/activerecord/test/fixtures/tagging.rb b/activerecord/test/fixtures/tagging.rb
index 8bc844c370..4d3878933a 100644
--- a/activerecord/test/fixtures/tagging.rb
+++ b/activerecord/test/fixtures/tagging.rb
@@ -1,4 +1,5 @@
 class Tagging < ActiveRecord::Base
   belongs_to :tag
+  belongs_to :super_tag, :class_name => 'Tag', :foreign_key => 'super_tag_id'
   belongs_to :taggable, :polymorphic => true, :counter_cache => true
 end
\ No newline at end of file
diff --git a/activerecord/test/fixtures/taggings.yml b/activerecord/test/fixtures/taggings.yml
index 38ec1ba5b1..617210d604 100644
--- a/activerecord/test/fixtures/taggings.yml
+++ b/activerecord/test/fixtures/taggings.yml
@@ -1,6 +1,7 @@
 welcome_general:
   id: 1
   tag_id: 1
+  super_tag_id: 2
   taggable_id: 1
   taggable_type: Post