Ensure Arel columns are typecasted properly when grouping with calculation

Fix build issue with postgresql.

1 files changed, 7 insertions, 3 deletions

diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index b766b92007..e1c1e449ef 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -58,12 +58,16 @@ class CalculationsTest < ActiveRecord::TestCase
 
   def test_should_group_by_field
     c = Account.group(:firm_id).sum(:credit_limit)
-    [1,6,2].each { |firm_id| assert c.keys.include?(firm_id) }
+    [1,6,2].each do |firm_id|
+      assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+    end
   end
 
   def test_should_group_by_arel_attribute
-    c = Account.sum(:credit_limit, :group => Account.arel_table[:firm_id])
-    [1,6,2].each { |firm_id| assert c.keys.include?(firm_id) }
+    c = Account.group(Account.arel_table[:firm_id]).sum(:credit_limit)
+    [1,6,2].each do |firm_id|
+      assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+    end
   end
 
   def test_should_group_by_multiple_fields