aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorDmitriy Kiriyenko <dmitriy.kiriyenko@gmail.com>2011-07-05 13:17:39 +0300
committerDmitriy Kiriyenko <dmitriy.kiriyenko@gmail.com>2011-07-27 16:48:15 +0300
commit9a298a162c16e019fe6971e563e7f4916e86ced6 (patch)
treecea21a5af39a744f182d5d419b9c76ca478557b2 /activerecord/lib/active_record
parent24f0a872e660647fe1abf187748660a77da3fe0a (diff)
downloadrails-9a298a162c16e019fe6971e563e7f4916e86ced6.tar.gz
rails-9a298a162c16e019fe6971e563e7f4916e86ced6.tar.bz2
rails-9a298a162c16e019fe6971e563e7f4916e86ced6.zip
Fixed failing query when performing calculation with having based on select.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 0ac821b2d7..9a7ff87e88 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -250,6 +250,7 @@ module ActiveRecord
operation,
distinct).as(aggregate_alias)
]
+ select_values += @select_values unless @having_values.empty?
select_values.concat group_fields.zip(group_aliases).map { |field,aliaz|
"#{field} AS #{aliaz}"