kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix preloading of has_one through associations

Browse source 
[#903 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Frederick Cheung 2008-08-25 22:36:19 +01:00 committed by Jeremy Kemper
parent f2d8d13c64
commit b7a37b742c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activerecord/lib/active_record/association_preload.rb
View file

@ -51,9 +51,7 @@ module ActiveRecord
def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record) def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record)
parent_records.each do |parent_record| parent_records.each do |parent_record|
association_proxy = parent_record.send(reflection_name) parent_record.send("set_#{reflection_name}_target", associated_record)
association_proxy.loaded
association_proxy.target = associated_record
end end
end end
@ -112,8 +110,8 @@ module ActiveRecord
def preload_has_one_association(records, reflection, preload_options={}) def preload_has_one_association(records, reflection, preload_options={})
id_to_record_map, ids = construct_id_map(records) id_to_record_map, ids = construct_id_map(records)
options = reflection.options options = reflection.options
records.each {|record| record.send("set_#{reflection.name}_target", nil)}
if options[:through] if options[:through]
records.each {|record| record.send(reflection.name) && record.send(reflection.name).loaded}
through_records = preload_through_records(records, reflection, options[:through]) through_records = preload_through_records(records, reflection, options[:through])
through_reflection = reflections[options[:through]] through_reflection = reflections[options[:through]]
through_primary_key = through_reflection.primary_key_name through_primary_key = through_reflection.primary_key_name
@ -126,8 +124,6 @@ module ActiveRecord
end end
end end
else else
records.each {|record| record.send("set_#{reflection.name}_target", nil)}
set_association_single_records(id_to_record_map, reflection.name, find_associated_records(ids, reflection, preload_options), reflection.primary_key_name) set_association_single_records(id_to_record_map, reflection.name, find_associated_records(ids, reflection, preload_options), reflection.primary_key_name)
end end
end end

14
activerecord/test/cases/associations/has_one_through_associations_test.rb
View file

@ -44,19 +44,23 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
def test_has_one_through_polymorphic def test_has_one_through_polymorphic
assert_equal clubs(:moustache_club), @member.sponsor_club assert_equal clubs(:moustache_club), @member.sponsor_club
end end
def has_one_through_to_has_many def has_one_through_to_has_many
assert_equal 2, @member.fellow_members.size assert_equal 2, @member.fellow_members.size
end end
def test_has_one_through_eager_loading def test_has_one_through_eager_loading
members = Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"]) members = assert_queries(3) do #base table, through table, clubs table
Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
end
assert_equal 1, members.size assert_equal 1, members.size
assert_not_nil assert_no_queries {members[0].club} assert_not_nil assert_no_queries {members[0].club}
end end
def test_has_one_through_eager_loading_through_polymorphic def test_has_one_through_eager_loading_through_polymorphic
members = Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"]) members = assert_queries(3) do #base table, through table, clubs table
Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
end
assert_equal 1, members.size assert_equal 1, members.size
assert_not_nil assert_no_queries {members[0].sponsor_club} assert_not_nil assert_no_queries {members[0].sponsor_club}
end end