diff options
author | Tristan Harward <trisweb@gmail.com> | 2013-01-06 15:39:09 -0500 |
---|---|---|
committer | Tristan Harward <trisweb@gmail.com> | 2013-01-06 16:09:40 -0500 |
commit | 807e176aba7804cad8d630d04f3b771011be4fe6 (patch) | |
tree | b10a9346cf09ecf9c29c55075e201b4da96edc68 /activerecord/lib/active_record | |
parent | 85afc11756630eb8d4bdc302ea026834251ffc8a (diff) | |
download | rails-807e176aba7804cad8d630d04f3b771011be4fe6.tar.gz rails-807e176aba7804cad8d630d04f3b771011be4fe6.tar.bz2 rails-807e176aba7804cad8d630d04f3b771011be4fe6.zip |
Fix error when assigning NaN to an integer column
Also covers any non-castable case by returning nil, which
is in-line with the intention of the former implementation,
but covers the odd cases which respond to to_i but raise
an error when it's called, such as NaN, Infinity and -Infinity.
Fixes #8757
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index 51d3acaff8..fb28ecb6cf 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -206,11 +206,7 @@ module ActiveRecord when TrueClass, FalseClass value ? 1 : 0 else - if value.respond_to?(:to_i) - value.to_i - else - nil - end + value.to_i rescue nil end end |