From 81b718728e5884ace2a965f8896dc5979aeb7284 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Thu, 3 Jul 2014 07:33:54 -0600
Subject: Do not rely on the column type when quoting infinity

---
 .../lib/active_record/connection_adapters/postgresql/oid/float.rb     | 1 +
 .../lib/active_record/connection_adapters/postgresql/quoting.rb       | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters/postgresql')

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 60b0ee526e..f37318d68f 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -34,9 +34,7 @@ module ActiveRecord
             else 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
-- 
cgit v1.2.3