diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 13:15:56 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 13:15:56 -0800 |
| commit | 9ee65aaaadfe40b0cd816e6665419cf55888f38e (patch) | |
| tree | b10a9346cf09ecf9c29c55075e201b4da96edc68 /activerecord/lib | |
| parent | 85afc11756630eb8d4bdc302ea026834251ffc8a (diff) | |
| parent | 807e176aba7804cad8d630d04f3b771011be4fe6 (diff) | |
| download | rails-9ee65aaaadfe40b0cd816e6665419cf55888f38e.tar.gz rails-9ee65aaaadfe40b0cd816e6665419cf55888f38e.tar.bz2 rails-9ee65aaaadfe40b0cd816e6665419cf55888f38e.zip | |
Merge pull request #8781 from trisweb/tristan_8757_integer_column_nan_error_fix
Fix error raised when assigning NaN to an integer column
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 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 |