diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-03 11:55:34 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-03 11:55:34 -0300 |
| commit | 0691810bca0d9e79abb9b9943b618159920b687c (patch) | |
| tree | 628368cbccd3c1e2c8c67281f34a948e30018534 /activerecord/lib/active_record/connection_adapters/postgresql | |
| parent | be543efe64fc19625fb56d5d2e38191c064c7636 (diff) | |
| parent | 81b718728e5884ace2a965f8896dc5979aeb7284 (diff) | |
| download | rails-0691810bca0d9e79abb9b9943b618159920b687c.tar.gz rails-0691810bca0d9e79abb9b9943b618159920b687c.tar.bz2 rails-0691810bca0d9e79abb9b9943b618159920b687c.zip | |
Merge pull request #16036 from sgrif/sg-datetime-infinity
Do not rely on the column type when quoting infinity
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb index 26c5d3d78f..78ef94b912 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb @@ -7,6 +7,7 @@ module ActiveRecord def cast_value(value) case value + when ::Float then value when 'Infinity' then ::Float::INFINITY when '-Infinity' then -::Float::INFINITY when 'NaN' then ::Float::NAN diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb index 7f09b01713..7c485eb9d0 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb @@ -29,9 +29,7 @@ module ActiveRecord super end when Float - if value.infinite? && column.type == :datetime - "'#{value.to_s.downcase}'" - elsif value.infinite? || value.nan? + if value.infinite? || value.nan? "'#{value.to_s}'" else super |