2 files changed, 18 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index f01717d1a7..1f55cce352 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -102,15 +102,7 @@ class PostgresqlCompositeWithCustomOIDTest < ActiveRecord::TestCase
   def setup
     super
 
-    @registration = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID
-    @registration.register_type "full_address", FullAddressType.new
-  end
-
-  def teardown
-    super
-
-    # there is currently no clean way to unregister a OID::Type
-    @registration::NAMES.delete("full_address")
+    @connection.type_map.register_type "full_address", FullAddressType.new
   end
 
   def test_column
diff --git a/activerecord/test/cases/connection_adapters/type/type_map_test.rb b/activerecord/test/cases/connection_adapters/type/type_map_test.rb
index 4b4d9f6b0f..3abd7a276e 100644
--- a/activerecord/test/cases/connection_adapters/type/type_map_test.rb
+++ b/activerecord/test/cases/connection_adapters/type/type_map_test.rb
@@ -88,6 +88,23 @@ module ActiveRecord
           assert_equal mapping.lookup('varchar'), binary
         end
 
+        def test_additional_lookup_args
+          mapping = TypeMap.new
+
+          mapping.register_type(/varchar/i) do |type, limit|
+            if limit > 255
+              'text'
+            else
+              'string'
+            end
+          end
+          mapping.alias_type(/string/i, 'varchar')
+
+          assert_equal mapping.lookup('varchar', 200), 'string'
+          assert_equal mapping.lookup('varchar', 400), 'text'
+          assert_equal mapping.lookup('string', 400), 'text'
+        end
+
         def test_requires_value_or_block
           mapping = TypeMap.new