aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/querying.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2014-11-14 10:45:53 -0700
committerSean Griffin <sean@thoughtbot.com>2014-11-14 14:30:39 -0700
commit70d1b5a7f8e25b077168deaf592e0e58c3f2bdd1 (patch)
tree1f74f87d45b6f539f8378a44652a9571bb47bfd0 /activerecord/lib/active_record/querying.rb
parent114e9f2bdf9327ebadb1fc72400c1ef80c3f6c3b (diff)
downloadrails-70d1b5a7f8e25b077168deaf592e0e58c3f2bdd1.tar.gz
rails-70d1b5a7f8e25b077168deaf592e0e58c3f2bdd1.tar.bz2
rails-70d1b5a7f8e25b077168deaf592e0e58c3f2bdd1.zip
Revert "Improve performance of AR object instantiation"
This reverts commit 8fee923888192a658d8823b31e77ed0683dfd665. Conflicts: activerecord/lib/active_record/attribute_set/builder.rb This solution sucks, and is hard to actually apply across the board. Going to try other solutions
Diffstat (limited to 'activerecord/lib/active_record/querying.rb')
-rw-r--r--activerecord/lib/active_record/querying.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 9d4df81b07..e8de4db3a7 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -47,7 +47,7 @@ module ActiveRecord
}
message_bus.instrument('instantiation.active_record', payload) do
- instantiate_result_set(result_set, column_types)
+ result_set.map { |record| instantiate(record, column_types) }
end
end