diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/type/decimal.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/types_test.rb | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/type/decimal.rb b/activerecord/lib/active_record/type/decimal.rb index a9db51c6ba..33d4e37ea3 100644 --- a/activerecord/lib/active_record/type/decimal.rb +++ b/activerecord/lib/active_record/type/decimal.rb @@ -14,7 +14,9 @@ module ActiveRecord private def cast_value(value) - if value.respond_to?(:to_d) + if value.class == Rational + BigDecimal.new(value, precision.to_i) + elsif value.respond_to?(:to_d) value.to_d else value.to_s.to_d diff --git a/activerecord/test/cases/types_test.rb b/activerecord/test/cases/types_test.rb index 47cf775cb6..4ba8a3e09f 100644 --- a/activerecord/test/cases/types_test.rb +++ b/activerecord/test/cases/types_test.rb @@ -102,6 +102,16 @@ module ActiveRecord assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1") end + def test_type_cast_rational_to_decimal_with_precision + type = Type::Decimal.new(:precision => 2) + assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3)) + end + + def test_type_cast_rational_to_decimal_without_precision_defaults_to_18_36 + type = Type::Decimal.new + assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3)) + end + def test_type_cast_binary type = Type::Binary.new assert_equal nil, type.type_cast_from_user(nil) |