diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:48:26 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:48:26 -0600 |
| commit | 03aacc55a239345a3ca8b36d188a338e7dab5189 (patch) | |
| tree | f36d7fdd0bd7daf91a7a2870cc5822fb9f3c5417 /activerecord/lib | |
| parent | d99db6b8b3e48ca209436facdac9899d3d99f641 (diff) | |
| parent | a7628099de796a2db2c18e946dab319abd0fcba2 (diff) | |
| download | rails-03aacc55a239345a3ca8b36d188a338e7dab5189.tar.gz rails-03aacc55a239345a3ca8b36d188a338e7dab5189.tar.bz2 rails-03aacc55a239345a3ca8b36d188a338e7dab5189.zip | |
Merge pull request #21756 from soutaro/qualify-column-in-calculation
Qualify column names in calculation
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 2 |
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 |