diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-06-02 20:40:25 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-06-02 20:41:11 +0100 |
| commit | bd75a722a2e9f979bfd1b1d89442e4dd6f3e3af7 (patch) | |
| tree | 7a6f50646a567af3ecca74ad7483b7502bc7ec33 /activerecord/lib | |
| parent | 952ec79bec313e0001adfc8c86f7970448d32db9 (diff) | |
| download | rails-bd75a722a2e9f979bfd1b1d89442e4dd6f3e3af7.tar.gz rails-bd75a722a2e9f979bfd1b1d89442e4dd6f3e3af7.tar.bz2 rails-bd75a722a2e9f979bfd1b1d89442e4dd6f3e3af7.zip | |
Ensure AR#sum result is typecasted properly
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 889b7845fb..caa8c539d5 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -265,8 +265,9 @@ module ActiveRecord def type_cast_calculated_value(value, column, operation = nil) operation = operation.to_s.downcase case operation - when 'count', 'sum' then value.to_i - when 'avg' then value && value.to_f + when 'count' then value.to_i + when 'sum' then value =~ /\./ ? value.to_f : value.to_i + when 'avg' then value && value.to_f else column ? column.type_cast(value) : value end end |