Skip to content
Browse files

Fix type casting to Decimal from Float with ...

When I defines large precision column at RDBMS,
I assigns float value, raise ArgumentError (precision too large).
  • Loading branch information...
1 parent 84093c6 commit 1d6a87779c73bc7d9d5f235afadc0df4a36f534f @joker1007 joker1007 committed Jul 29, 2014
View
4 activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Fix Type casting to Decimal from Float with large precision.
+
+ *Tomohiro Hashidate*
+
* No verbose backtrace by db:drop when database does not exist.
Fixes #16295.
View
21 activerecord/lib/active_record/type/decimal.rb
@@ -14,12 +14,25 @@ def type_cast_for_schema(value)
private
def cast_value(value)
- if value.is_a?(::Numeric) || value.is_a?(::String)
+ case value
+ when ::Float
+ BigDecimal(value, float_precision)
+ when ::Numeric, ::String
BigDecimal(value, precision.to_i)
- elsif value.respond_to?(:to_d)
- value.to_d
else
- cast_value(value.to_s)
+ if value.respond_to?(:to_d)
+ value.to_d
+ else
+ cast_value(value.to_s)
+ end
+ end
+ end
+
+ def float_precision
+ if precision.to_i > ::Float::DIG + 1
+ ::Float::DIG + 1
+ else
+ precision.to_i
end
end
end
View
5 activerecord/test/cases/type/decimal_test.rb
@@ -10,6 +10,11 @@ def test_type_cast_decimal
assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
end
+ def test_type_cast_decimal_from_float_with_large_precision
+ type = Decimal.new(precision: ::Float::DIG + 2)
+ assert_equal BigDecimal.new("123.0"), type.type_cast_from_user(123.0)
+ end
+
def test_type_cast_decimal_from_rational_with_precision
type = Decimal.new(precision: 2)
assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))

0 comments on commit 1d6a877

Please sign in to comment.
Something went wrong with that request. Please try again.