提交 51d6e21c 编写于 作者: T Tim Macfarlane

ActiveRecord: sum expression returns string '0' for no records, fixed

上级 081f0ad4
......@@ -906,3 +906,8 @@
*Aaron Patterson*
Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/activerecord/CHANGELOG.md) for previous changes.
* Fix bug where sum(expression) returns string '0' for no matching records
Fixes #7439
*Tim Macfarlane*
......@@ -349,7 +349,7 @@ def column_for(field)
def type_cast_calculated_value(value, column, operation = nil)
case operation
when 'count' then value.to_i
when 'sum' then type_cast_using_column(value || '0', column)
when 'sum' then type_cast_using_column(value || 0, column)
when 'average' then value.respond_to?(:to_d) ? value.to_d : value
else type_cast_using_column(value, column)
end
......
......@@ -378,6 +378,10 @@ def test_should_sum_expression
end
end
def test_sum_expression_returns_zero_when_no_records_to_sum
assert_equal 0, Account.where('1 = 2').sum("2 * credit_limit")
end
def test_count_with_from_option
assert_equal Company.count(:all), Company.from('companies').count(:all)
assert_equal Account.where("credit_limit = 50").count(:all),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册