aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/calculations.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-28 16:14:39 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-28 16:14:39 -0700
commite6ca7e7197f46df0e538f50cea236cb923e4b47f (patch)
tree27e082f1bd6e0d11932eaeb00401801584a964d1 /activerecord/lib/active_record/relation/calculations.rb
parentc2cad2d97e5feb872ac9222d8f4e393201f4ad18 (diff)
downloadrails-e6ca7e7197f46df0e538f50cea236cb923e4b47f.tar.gz
rails-e6ca7e7197f46df0e538f50cea236cb923e4b47f.tar.bz2
rails-e6ca7e7197f46df0e538f50cea236cb923e4b47f.zip
refactoring to remove crazy logic
Diffstat (limited to 'activerecord/lib/active_record/relation/calculations.rb')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 0b3d1ed3ff..03862c78e4 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -191,7 +191,11 @@ module ActiveRecord
end
# Postgresql doesn't like ORDER BY when there are no GROUP BY
- relation = except(:order).select(operation == 'count' ? column.count(distinct) : column.send(operation))
+ relation = except(:order)
+ select_value = operation == 'count' ? column.count(distinct) : column.send(operation)
+
+ relation.select_values = [select_value]
+
type_cast_calculated_value(@klass.connection.select_value(relation.to_sql), column_for(column_name), operation)
end