1 files changed, 16 insertions, 30 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index 1122f8b9a1..894cf1ffa2 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -10,53 +10,39 @@ module ActiveRecord
         end
 
         def test_type_cast_true
-          c = Column.new(nil, 1, 'boolean')
-          assert_equal 't', @conn.type_cast(true, nil)
-          assert_equal 't', @conn.type_cast(true, c)
+          assert_equal 't', @conn.type_cast(true)
         end
 
         def test_type_cast_false
-          c = Column.new(nil, 1, 'boolean')
-          assert_equal 'f', @conn.type_cast(false, nil)
-          assert_equal 'f', @conn.type_cast(false, c)
-        end
-
-        def test_type_cast_cidr
-          ip = IPAddr.new('255.0.0.0/8')
-          c = Column.new(nil, ip, 'cidr')
-          assert_equal ip, @conn.type_cast(ip, c)
-        end
-
-        def test_type_cast_inet
-          ip = IPAddr.new('255.1.0.0/8')
-          c = Column.new(nil, ip, 'inet')
-          assert_equal ip, @conn.type_cast(ip, c)
+          assert_equal 'f', @conn.type_cast(false)
         end
 
         def test_quote_float_nan
           nan = 0.0/0
-          c = Column.new(nil, 1, 'float')
-          assert_equal "'NaN'", @conn.quote(nan, c)
+          assert_equal "'NaN'", @conn.quote(nan)
         end
 
         def test_quote_float_infinity
           infinity = 1.0/0
-          c = Column.new(nil, 1, 'float')
-          assert_equal "'Infinity'", @conn.quote(infinity, c)
-        end
-
-        def test_quote_cast_numeric
-          fixnum = 666
-          c = Column.new(nil, nil, 'varchar')
-          assert_equal "'666'", @conn.quote(fixnum, c)
-          c = Column.new(nil, nil, 'text')
-          assert_equal "'666'", @conn.quote(fixnum, c)
+          assert_equal "'Infinity'", @conn.quote(infinity)
         end
 
         def test_quote_time_usec
           assert_equal "'1970-01-01 00:00:00.000000'", @conn.quote(Time.at(0))
           assert_equal "'1970-01-01 00:00:00.000000'", @conn.quote(Time.at(0).to_datetime)
         end
+
+        def test_quote_range
+          range = "1,2]'; SELECT * FROM users; --".."a"
+          type = OID::Range.new(Type::Integer.new, :int8range)
+          assert_equal "'[1,0]'", @conn.quote(type.type_cast_for_database(range))
+        end
+
+        def test_quote_bit_string
+          value = "'); SELECT * FROM users; /*\n01\n*/--"
+          type = OID::Bit.new
+          assert_equal nil, @conn.quote(type.type_cast_for_database(value))
+        end
       end
     end
   end