aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-11 18:13:50 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-11 18:13:50 -0300
commit1ed2c3cf6a76b0b18d5db36b453324aee175c8c8 (patch)
treed173e9b6834bd0bc2c795e6ce5f5131f82b4f6bf /activerecord/lib
parent1b14bff81a9ab6654badf52b552f90c8fc3ab0e3 (diff)
parentfef044cd2bd167201462861385ebf38bbf3158d7 (diff)
downloadrails-1ed2c3cf6a76b0b18d5db36b453324aee175c8c8.tar.gz
rails-1ed2c3cf6a76b0b18d5db36b453324aee175c8c8.tar.bz2
rails-1ed2c3cf6a76b0b18d5db36b453324aee175c8c8.zip
Merge pull request #15652 from sgrif/pluck-multiple-named-columns
Pluck should work with columns of the same name from different tables
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 38970a66ae..028e4d80ab 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -176,9 +176,7 @@ module ActiveRecord
}
end
- result = result.map do |attributes|
- values = attributes.values
-
+ result = result.rows.map do |values|
columns.zip(values).map { |column, value| column.type_cast_from_database value }
end
columns.one? ? result.map!(&:first) : result