aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
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/CHANGELOG.md
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/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 1606b1a9f6..495390d16c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,9 +1,10 @@
## Rails 3.2.11 (unreleased)
-* Fix undefined method `to_i` when calling `new` on a scope that uses an Array.
- Fixes #8718.
+* Fix undefined method `to_i` when calling `new` on a scope that uses an
+ Array; Fix FloatDomainError when setting integer column to NaN.
+ Fixes #8718, #8734, #8757.
- *Jason Stirk*
+ *Jason Stirk + Tristan Harward*
* Serialized attributes can be serialized in integer columns.
Fix #8575.