aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorTristan Harward <trisweb@gmail.com>2013-01-06 15:39:09 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-06 18:21:36 -0300
commitc147dd7ddd206f6c2d80d8957ee9fa575b00b13c (patch)
tree58703e1075f81bdaf8c5aa75b558b9d0b10c8255 /activerecord/test
parent756188b512ca11e24262a74856e3bc11b9b2dbc9 (diff)
downloadrails-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/test')
-rw-r--r--activerecord/test/cases/column_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index 8017a49827..77647d7986 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -56,6 +56,12 @@ module ActiveRecord
column = Column.new("field", nil, "integer")
assert_nil column.type_cast(Object.new)
end
+
+ def test_type_cast_nan_and_infinity_to_integer
+ column = Column.new("field", nil, "integer")
+ assert_nil column.type_cast(Float::NAN)
+ assert_nil column.type_cast(1.0/0.0)
+ end
end
end
end