diff options
| author | Tristan Harward <trisweb@gmail.com> | 2013-01-06 15:39:09 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 18:21:36 -0300 |
| commit | c147dd7ddd206f6c2d80d8957ee9fa575b00b13c (patch) | |
| tree | 58703e1075f81bdaf8c5aa75b558b9d0b10c8255 /activerecord/lib | |
| parent | 756188b512ca11e24262a74856e3bc11b9b2dbc9 (diff) | |
| download | rails-c147dd7ddd206f6c2d80d8957ee9fa575b00b13c.tar.gz rails-c147dd7ddd206f6c2d80d8957ee9fa575b00b13c.tar.bz2 rails-c147dd7ddd206f6c2d80d8957ee9fa575b00b13c.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
Backport of #8781
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/column_test.rb
Diffstat (limited to 'activerecord/lib')
| -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 b93a728a39..e22d9f7222 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -175,11 +175,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 |