github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 08:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

More efficient association preloading code that compacts a through_records array in a central location. Closes #11427 [danger]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9094 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson
2008-03-26 15:26:59 +00:00
parent ca9413674e
commit 628ffad98b
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* More efficient association preloading code that compacts a through_records array in a central location. Closes #11427 [danger]
* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria, Sunny Ripert]
* Fixed that ActiveRecord#Base.find_or_create/initialize would not honor attr_protected/accessible when used with a hash #11422 [miloops]

19
activerecord/lib/active_record/association_preload.rb
View File

@@ -115,17 +115,17 @@ module ActiveRecord
unless through_records.empty?
source = reflection.source_reflection.name
through_records.first.class.preload_associations(through_records, source)
through_records.compact.each do |through_record|
through_records.each do |through_record|
add_preloaded_record_to_collection(id_to_record_map[through_record[through_primary_key].to_i],
reflection.name, through_record.send(source))
end
end
else
end
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)
end
end
end
def preload_has_many_association(records, reflection, preload_options={})
@@ -140,7 +140,7 @@ module ActiveRecord
unless through_records.empty?
source = reflection.source_reflection.name
through_records.first.class.preload_associations(through_records, source)
through_records.compact.each do |through_record|
through_records.each do |through_record|
add_preloaded_records_to_collection(id_to_record_map[through_record[through_primary_key].to_i],
reflection.name, through_record.send(source))
end
@@ -159,11 +159,12 @@ module ActiveRecord
interface = reflection.source_reflection.options[:foreign_type]
preload_options = {:conditions => ["#{interface} = ?", reflection.options[:source_type]]}
records.compact!
records.first.class.preload_associations(records, through_association, preload_options)
# Dont cache the association - we would only be caching a subset
through_records = []
records.compact.each do |record|
records.each do |record|
proxy = record.send(through_association)
if proxy.respond_to?(:target)
@@ -173,11 +174,13 @@ module ActiveRecord
through_records << proxy if proxy
end
end
through_records = through_records.flatten
through_records.flatten!
else
records.first.class.preload_associations(records, through_association)
through_records = records.compact.map {|record| record.send(through_association)}.flatten
through_records = records.map {|record| record.send(through_association)}.flatten
end
through_records.compact!
through_records
end
# FIXME: quoting