aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/preloader.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-10-05 12:07:16 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2012-10-05 12:07:16 -0300
commita0613ad8a9773c76a9b0a256f7099fde35823674 (patch)
treeac866e7a5c8fa4c15f025759dd0ed1dccb54d311 /activerecord/lib/active_record/associations/preloader.rb
parentabf8de85519141496a6773310964ec03f6106f3f (diff)
downloadrails-a0613ad8a9773c76a9b0a256f7099fde35823674.tar.gz
rails-a0613ad8a9773c76a9b0a256f7099fde35823674.tar.bz2
rails-a0613ad8a9773c76a9b0a256f7099fde35823674.zip
Revert "Use flat_map { } instead of map {}.flatten"
This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]]
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader.rb')
-rw-r--r--activerecord/lib/active_record/associations/preloader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
index 9cbc117945..ce5bf15f10 100644
--- a/activerecord/lib/active_record/associations/preloader.rb
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -106,7 +106,7 @@ module ActiveRecord
def preload_hash(association)
association.each do |parent, child|
Preloader.new(records, parent, preload_scope).run
- Preloader.new(records.flat_map { |record| record.send(parent) }, child).run
+ Preloader.new(records.map { |record| record.send(parent) }.flatten, child).run
end
end