diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 16:47:35 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 16:47:35 -0700 |
| commit | 58950ee224e8d81cb8bd79edb4a2f0fb7ca75b68 (patch) | |
| tree | 36416b1e373352122bb7f6e03186afe37d5153aa /activerecord/lib | |
| parent | d5cc7113076ccd82b6e7582ce77fd2062323c87d (diff) | |
| parent | 06c23c4c7ff842f7c6237f3ac43fc9d19509a947 (diff) | |
| download | rails-58950ee224e8d81cb8bd79edb4a2f0fb7ca75b68.tar.gz rails-58950ee224e8d81cb8bd79edb4a2f0fb7ca75b68.tar.bz2 rails-58950ee224e8d81cb8bd79edb4a2f0fb7ca75b68.zip | |
Merge pull request #3713 from kf8a/master
postgresql adapter should quote not a number and infinity correctly for float columns
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 68cf495025..4d5459939b 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -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. |