1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #3713 from kf8a/master

postgresql adapter should quote not a number and infinity correctly for float columns
This commit is contained in:
Aaron Patterson 2012-05-04 16:47:35 -07:00
commit 58950ee224
2 changed files with 19 additions and 2 deletions

View file

@ -511,8 +511,13 @@ module ActiveRecord
else super
end
when Float
return super unless value.infinite? && column.type == :datetime
"'#{value.to_s.downcase}'"
if value.infinite? && column.type == :datetime
"'#{value.to_s.downcase}'"
elsif value.infinite? || value.nan?
"'#{value.to_s}'"
else
super
end
when Numeric
return super unless column.sql_type == 'money'
# Not truly string input, so doesn't require (or allow) escape string syntax.

View file

@ -19,6 +19,18 @@ module ActiveRecord
assert_equal 'f', @conn.type_cast(false, nil)
assert_equal 'f', @conn.type_cast(false, c)
end
def test_quote_float_nan
nan = 0.0/0
c = Column.new(nil, 1, 'float')
assert_equal "'NaN'", @conn.quote(nan, c)
end
def test_quote_float_infinity
infinity = 1.0/0
c = Column.new(nil, 1, 'float')
assert_equal "'Infinity'", @conn.quote(infinity, c)
end
end
end
end