From 41f1323e74c348b5fdcbb55b30ecf349c0cad509 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Mon, 22 Dec 2014 07:07:42 -0700
Subject: Correctly handle Float -> BigDecimal with unspecified precision

Fixes #18122
---
 activerecord/lib/active_record/type/decimal.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/type/decimal.rb b/activerecord/lib/active_record/type/decimal.rb
index d10778eeb6..7b2bee2c42 100644
--- a/activerecord/lib/active_record/type/decimal.rb
+++ b/activerecord/lib/active_record/type/decimal.rb
@@ -16,7 +16,7 @@ module ActiveRecord
       def cast_value(value)
         case value
         when ::Float
-          BigDecimal(value, float_precision)
+          convert_float_to_big_decimal(value)
         when ::Numeric, ::String
           BigDecimal(value, precision.to_i)
         else
@@ -28,6 +28,14 @@ module ActiveRecord
         end
       end
 
+      def convert_float_to_big_decimal(value)
+        if precision
+          BigDecimal(value, float_precision)
+        else
+          value.to_d
+        end
+      end
+
       def float_precision
         if precision.to_i > ::Float::DIG + 1
           ::Float::DIG + 1
-- 
cgit v1.2.3