Stop depending on columns for type information in PG quoting tests

A few of the tests weren't testing anything of value. The IP Address
tests are testing the type, not behavior of the connection adapter.
There are two CVE regression tests which are important, but don't have a
good place to go, so I've left them alone for now, as they call `quote`
and the focus right now is removing `column` from `type_cast`

2 files changed, 29 insertions, 30 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/cidr_test.rb b/activerecord/test/cases/adapters/postgresql/cidr_test.rb
new file mode 100644
index 0000000000..54b679d3ab
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/cidr_test.rb
@@ -0,0 +1,25 @@
+require "cases/helper"
+require "ipaddr"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      class CidrTest < ActiveRecord::TestCase
+        test "type casting IPAddr for database" do
+          type = OID::Cidr.new
+          ip = IPAddr.new("255.0.0.0/8")
+          ip2 = IPAddr.new("127.0.0.1")
+
+          assert_equal "255.0.0.0/8", type.type_cast_for_database(ip)
+          assert_equal "127.0.0.1/32", type.type_cast_for_database(ip2)
+        end
+
+        test "casting does nothing with non-IPAddr objects" do
+          type = OID::Cidr.new
+
+          assert_equal "foo", type.type_cast_for_database("foo")
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index 11d5173d37..9ac0036d66 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -10,47 +10,21 @@ module ActiveRecord
         end
 
         def test_type_cast_true
-          c = PostgreSQLColumn.new(nil, 1, Type::Boolean.new, '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 = PostgreSQLColumn.new(nil, 1, Type::Boolean.new, '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 = PostgreSQLColumn.new(nil, ip, OID::Cidr.new, 'cidr')
-          assert_equal ip, @conn.type_cast(ip, c)
-        end
-
-        def test_type_cast_inet
-          ip = IPAddr.new('255.1.0.0/8')
-          c = PostgreSQLColumn.new(nil, ip, OID::Cidr.new, '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 = PostgreSQLColumn.new(nil, 1, OID::Float.new, '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 = PostgreSQLColumn.new(nil, 1, OID::Float.new, 'float')
-          assert_equal "'Infinity'", @conn.quote(infinity, c)
-        end
-
-        def test_quote_cast_numeric
-          fixnum = 666
-          c = PostgreSQLColumn.new(nil, nil, Type::String.new, 'varchar')
-          assert_equal "'666'", @conn.quote(fixnum, c)
-          c = PostgreSQLColumn.new(nil, nil, Type::Text.new, 'text')
-          assert_equal "'666'", @conn.quote(fixnum, c)
+          assert_equal "'Infinity'", @conn.quote(infinity)
         end
 
         def test_quote_time_usec