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

1 files changed, 3 insertions, 18 deletions

diff --git a/activerecord/lib/active_record/attribute_set/builder.rb b/activerecord/lib/active_record/attribute_set/builder.rb
index 0a62c68bfb..d4a787f2fe 100644
--- a/activerecord/lib/active_record/attribute_set/builder.rb
+++ b/activerecord/lib/active_record/attribute_set/builder.rb
@@ -8,33 +8,18 @@ module ActiveRecord
       end
 
       def build_from_database(values = {}, additional_types = {})
-        build_from_database_pairs(values.keys, values.values, additional_types)
-      end
-
-      def build_from_database_pairs(columns, values, additional_types)
-        attributes = build_attributes_from_values(columns, values, additional_types)
+        attributes = build_attributes_from_values(values, additional_types)
         add_uninitialized_attributes(attributes)
         AttributeSet.new(attributes)
       end
 
       private
 
-      def build_attributes_from_values(columns, values, additional_types)
-        # We are performing manual iteration here as this method is a performance
-        # hotspot
-        hash = {}
-        index = 0
-        length = columns.length
-
-        while index < length
-          name = columns[index]
-          value = values[index]
+      def build_attributes_from_values(values, additional_types)
+        values.each_with_object({}) do |(name, value), hash|
           type = additional_types.fetch(name, types[name])
           hash[name] = Attribute.from_database(name, value, type)
-          index += 1
         end
-
-        hash
       end
 
       def add_uninitialized_attributes(attributes)