mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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).
This commit is contained in:
parent
84093c6627
commit
1d6a87779c
3 changed files with 26 additions and 4 deletions
|
@ -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.
|
* No verbose backtrace by db:drop when database does not exist.
|
||||||
|
|
||||||
Fixes #16295.
|
Fixes #16295.
|
||||||
|
|
|
@ -14,14 +14,27 @@ module ActiveRecord
|
||||||
private
|
private
|
||||||
|
|
||||||
def cast_value(value)
|
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)
|
BigDecimal(value, precision.to_i)
|
||||||
elsif value.respond_to?(:to_d)
|
else
|
||||||
|
if value.respond_to?(:to_d)
|
||||||
value.to_d
|
value.to_d
|
||||||
else
|
else
|
||||||
cast_value(value.to_s)
|
cast_value(value.to_s)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def float_precision
|
||||||
|
if precision.to_i > ::Float::DIG + 1
|
||||||
|
::Float::DIG + 1
|
||||||
|
else
|
||||||
|
precision.to_i
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -10,6 +10,11 @@ module ActiveRecord
|
||||||
assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
|
assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
|
||||||
end
|
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
|
def test_type_cast_decimal_from_rational_with_precision
|
||||||
type = Decimal.new(precision: 2)
|
type = Decimal.new(precision: 2)
|
||||||
assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
|
assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
|
||||||
|
|
Loading…
Reference in a new issue