diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-11 13:38:17 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-11 13:45:05 -0800 |
commit | f6b71dea15435ea91e4db27ddf657ff840fd3a72 (patch) | |
tree | 71f73cd2738838c498a9d4d4718cd985f84bf1e4 | |
parent | a61e3acef25d8fb86275d41a9d0d1ba163d7e0bb (diff) | |
download | rails-f6b71dea15435ea91e4db27ddf657ff840fd3a72.tar.gz rails-f6b71dea15435ea91e4db27ddf657ff840fd3a72.tar.bz2 rails-f6b71dea15435ea91e4db27ddf657ff840fd3a72.zip |
avoid splatting arrays by using concat
-rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index dc15b2f4c3..bb7ddfcae9 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -126,7 +126,7 @@ module ActiveRecord parent_records.each do |parent_record| association_proxy = parent_record.send(reflection_name) association_proxy.loaded - association_proxy.target.push(*Array.wrap(associated_record)) + association_proxy.target.concat(Array.wrap(associated_record)) association_proxy.send(:set_inverse_instance, associated_record) end end @@ -139,8 +139,8 @@ module ActiveRecord def set_association_collection_records(id_to_record_map, reflection_name, associated_records, key) associated_records.each do |associated_record| - mapped_records = id_to_record_map[associated_record[key].to_s] - add_preloaded_records_to_collection(mapped_records, reflection_name, associated_record) + parent_records = id_to_record_map[associated_record[key].to_s] + add_preloaded_records_to_collection(parent_records, reflection_name, associated_record) end end |