diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 21:54:18 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 21:54:18 -0500 |
| commit | 7c73518ef7cc49a4bee317e89c850b87ea1dea93 (patch) | |
| tree | 2feab5687c0d036503ea52ab20d69dc313a1124f /activerecord/lib/active_record | |
| parent | 0be5bc3f5981f11d81c24ccfb97863a69406cf9d (diff) | |
| parent | a7f920f674d234f281d2491ebe6d74710a79e663 (diff) | |
| download | rails-7c73518ef7cc49a4bee317e89c850b87ea1dea93.tar.gz rails-7c73518ef7cc49a4bee317e89c850b87ea1dea93.tar.bz2 rails-7c73518ef7cc49a4bee317e89c850b87ea1dea93.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 5e33cf1bd4..dd90580b3d 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_d + when 'avg' then value && value.to_f.to_d else type_cast_using_column(value, column) end end |