aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/type/decimal.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-20 18:10:54 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-20 18:10:54 -0300
commit52b558695d5a1b33ff21516cbc71d1ae1dee4632 (patch)
tree3bfcd3aaca10539014e352c5f1582175f42375e6 /activerecord/lib/active_record/connection_adapters/type/decimal.rb
parent90a82cbfb26a24f801864a7fd2664553876b51f3 (diff)
parent8f387995054d9ce79522da8ef65fba28c6ea0785 (diff)
downloadrails-52b558695d5a1b33ff21516cbc71d1ae1dee4632.tar.gz
rails-52b558695d5a1b33ff21516cbc71d1ae1dee4632.tar.bz2
rails-52b558695d5a1b33ff21516cbc71d1ae1dee4632.zip
Merge pull request #15207 from sgrif/sg-inline-column-helpers
Inline typecasting helpers from Column to the appropriate types
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/type/decimal.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/type/decimal.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/type/decimal.rb b/activerecord/lib/active_record/connection_adapters/type/decimal.rb
index 91957fe84b..6fb1a6c3b0 100644
--- a/activerecord/lib/active_record/connection_adapters/type/decimal.rb
+++ b/activerecord/lib/active_record/connection_adapters/type/decimal.rb
@@ -11,7 +11,11 @@ module ActiveRecord
private
def cast_value(value)
- Column.value_to_decimal(value)
+ if value.respond_to?(:to_d)
+ value.to_d
+ else
+ value.to_s.to_d
+ end
end
end
end