From 160af90ac02a566d4d56bed6d7fa5e5026375a70 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 28 Dec 2012 23:09:50 -0800 Subject: fix time typcasting on group counts in PG --- activerecord/lib/active_record/relation/calculations.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 70d07fdd36..29f205450d 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -274,7 +274,7 @@ module ActiveRecord column_alias_for(field) } group_columns = group_aliases.zip(group_fields).map { |aliaz,field| - [aliaz, column_for(field)] + [aliaz, field] } group = group_fields @@ -314,7 +314,10 @@ module ActiveRecord end Hash[calculated_data.map do |row| - key = group_columns.map { |aliaz, column| + key = group_columns.map { |aliaz, column_name| + column = calculated_data.column_types.fetch(aliaz) do + column_for(column_name) + end type_cast_calculated_value(row[aliaz], column) } key = key.first if key.size == 1 -- cgit v1.2.3