Permalink
Browse files

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
  • Loading branch information...
1 parent 1e7ce13 commit fbd1e01bd6ca1b093811b0781d85f53850df12e3 @technoweenie technoweenie committed Mar 18, 2006
@@ -1,5 +1,7 @@
*SVN*
+* 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]
+
* SQL Server adapter gets some love #4298 [rtomayko@gmail.com]
* Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 [derrickspell@cdmplus.com]
@@ -65,14 +65,17 @@ def construct_conditions
raise ActiveRecordError, "Could not find the association '#{@reflection.options[:through]}' in model #{@reflection.klass}"
end
+ # Get the actual primary key of the belongs_to association that the reflection is going through
+ source_primary_key = through_reflection.klass.reflect_on_association(@reflection.name.to_s.singularize.to_sym).primary_key_name
+
if through_reflection.options[:as]
conditions =
- "#{@reflection.table_name}.#{@reflection.klass.primary_key} = #{through_reflection.table_name}.#{@reflection.klass.to_s.foreign_key} " +
+ "#{@reflection.table_name}.#{@reflection.klass.primary_key} = #{through_reflection.table_name}.#{source_primary_key} " +
"AND #{through_reflection.table_name}.#{through_reflection.options[:as]}_id = #{@owner.quoted_id} " +
"AND #{through_reflection.table_name}.#{through_reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}"
else
conditions =
- "#{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{through_reflection.table_name}.#{@reflection.klass.to_s.foreign_key} " +
+ "#{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{through_reflection.table_name}.#{source_primary_key} " +
"AND #{through_reflection.table_name}.#{through_reflection.primary_key_name} = #{@owner.quoted_id}"
end
@@ -140,13 +140,19 @@ def counter_cache_column
end
end
+ def through_reflection
+ @through_reflection ||= options[:through] ? active_record.reflect_on_association(options[:through]) : false
+ end
+
private
def name_to_class_name(name)
if name =~ /::/
name
else
if options[:class_name]
options[:class_name]
+ elsif through_reflection # get the class_name of the belongs_to association of the through reflection
+ through_reflection.klass.reflect_on_association(name.to_s.singularize.to_sym).class_name
else
class_name = name.to_s.camelize
class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro)
@@ -39,6 +39,11 @@ def test_polymorphic_has_many_going_through_join_model
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
@@ -2,6 +2,7 @@
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
@@ -22,6 +22,7 @@ def find_most_recent
has_many :taggings, :as => :taggable
has_many :tags, :through => :taggings
+ has_many :super_tags, :through => :taggings
has_one :tagging, :as => :taggable
@@ -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
@@ -1,6 +1,7 @@
welcome_general:
id: 1
tag_id: 1
+ super_tag_id: 2
taggable_id: 1
taggable_type: Post

0 comments on commit fbd1e01

Please sign in to comment.