aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorSoutaro Matsumoto <matsumoto@soutaro.com>2015-09-25 00:30:22 +0900
committerSean Griffin <sean@seantheprogrammer.com>2015-10-20 14:47:55 -0600
commita7628099de796a2db2c18e946dab319abd0fcba2 (patch)
treef36d7fdd0bd7daf91a7a2870cc5822fb9f3c5417 /activerecord/lib
parentd99db6b8b3e48ca209436facdac9899d3d99f641 (diff)
downloadrails-a7628099de796a2db2c18e946dab319abd0fcba2.tar.gz
rails-a7628099de796a2db2c18e946dab319abd0fcba2.tar.bz2
rails-a7628099de796a2db2c18e946dab319abd0fcba2.zip
Qualify column names in calculation
Column names inserted via `group` have to be qualified with table name.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 16d5774fec..1ff06b0679 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -297,7 +297,7 @@ module ActiveRecord
]
select_values += select_values unless having_clause.empty?
- select_values.concat group_fields.zip(group_aliases).map { |field,aliaz|
+ select_values.concat arel_columns(group_fields).zip(group_aliases).map { |field,aliaz|
if field.respond_to?(:as)
field.as(aliaz)
else