Freeze columns only once per Result

Conflicts: activerecord/lib/active_record/result.rb
rails · Mar 3, 2013 · d2b9862 · d2b9862
1 parent 2e2f8c0
commit d2b9862
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/result.rb b/activerecord/lib/active_record/result.rb
@@ -26,9 +26,15 @@ def to_hash
 
     private
     def hash_rows
-      @hash_rows ||= @rows.map { |row|
+      @hash_rows ||=
-        Hash[@columns.zip(row)]
+        begin
-      }
+          # We freeze the strings to prevent them getting duped when
+          # used as keys in ActiveRecord::Model's @attributes hash
+          columns = @columns.map { |c| c.dup.freeze }
+          @rows.map { |row|
+            Hash[columns.zip(row)]
+          }
+        end
     end
   end
 end