Add simple case when DB calculations returns 0 instead of 0.0 [#1346 state:resolved]

1 files changed, 1 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb
index dd90580b3d..6f4e02b430 100644
--- a/activerecord/lib/active_record/calculations.rb
+++ b/activerecord/lib/active_record/calculations.rb
@@ -286,7 +286,7 @@ module ActiveRecord
           case operation
             when 'count' then value.to_i
             when 'sum'   then type_cast_using_column(value || '0', column)
-            when 'avg'   then value && value.to_f.to_d
+            when 'avg'   then value && (value == 0 ? 0.0.to_d : value.to_d)
             else type_cast_using_column(value, column)
           end
         end