Merge pull request #15370 from sgrif/sg-type-namespace

Move types to the top level `ActiveRecord` namespace

3 files changed, 131 insertions, 143 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index 972abf7cdc..ecccbf10e6 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -83,7 +83,7 @@ end
 class PostgresqlCompositeWithCustomOIDTest < ActiveRecord::TestCase
   include PostgresqlCompositeBehavior
 
-  class FullAddressType < ActiveRecord::ConnectionAdapters::Type::Value
+  class FullAddressType < ActiveRecord::Type::Value
     def type; :full_address end
 
     def type_cast(value)
diff --git a/activerecord/test/cases/connection_adapters/type/type_map_test.rb b/activerecord/test/cases/connection_adapters/type/type_map_test.rb
deleted file mode 100644
index e85bbc8dc7..0000000000
--- a/activerecord/test/cases/connection_adapters/type/type_map_test.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
-  module ConnectionAdapters
-    module Type
-      class TypeMapTest < ActiveRecord::TestCase
-        def test_default_type
-          mapping = TypeMap.new
-
-          assert_kind_of Value, mapping.lookup(:undefined)
-        end
-
-        def test_registering_types
-          boolean = Boolean.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/boolean/i, boolean)
-
-          assert_equal mapping.lookup('boolean'), boolean
-        end
-
-        def test_overriding_registered_types
-          time = Time.new
-          timestamp = DateTime.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/time/i, time)
-          mapping.register_type(/time/i, timestamp)
-
-          assert_equal mapping.lookup('time'), timestamp
-        end
-
-        def test_fuzzy_lookup
-          string = String.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/varchar/i, string)
-
-          assert_equal mapping.lookup('varchar(20)'), string
-        end
-
-        def test_aliasing_types
-          string = String.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/string/i, string)
-          mapping.alias_type(/varchar/i, 'string')
-
-          assert_equal mapping.lookup('varchar'), string
-        end
-
-        def test_changing_type_changes_aliases
-          time = Time.new
-          timestamp = DateTime.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/timestamp/i, time)
-          mapping.alias_type(/datetime/i, 'timestamp')
-          mapping.register_type(/timestamp/i, timestamp)
-
-          assert_equal mapping.lookup('datetime'), timestamp
-        end
-
-        def test_aliases_keep_metadata
-          mapping = TypeMap.new
-
-          mapping.register_type(/decimal/i) { |sql_type| sql_type }
-          mapping.alias_type(/number/i, 'decimal')
-
-          assert_equal mapping.lookup('number(20)'), 'decimal(20)'
-          assert_equal mapping.lookup('number'), 'decimal'
-        end
-
-        def test_register_proc
-          string = String.new
-          binary = Binary.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/varchar/i) do |type|
-            if type.include?('(')
-              string
-            else
-              binary
-            end
-          end
-
-          assert_equal mapping.lookup('varchar(20)'), string
-          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
-
-          assert_raises(ArgumentError) do
-            mapping.register_type(/only key/i)
-          end
-        end
-
-        def test_lookup_non_strings
-          mapping = HashLookupTypeMap.new
-
-          mapping.register_type(1, 'string')
-          mapping.register_type(2, 'int')
-          mapping.alias_type(3, 1)
-
-          assert_equal mapping.lookup(1), 'string'
-          assert_equal mapping.lookup(2), 'int'
-          assert_equal mapping.lookup(3), 'string'
-          assert_kind_of Type::Value, mapping.lookup(4)
-        end
-
-        def test_clear_mappings
-          time = Time.new
-          mapping = TypeMap.new
-
-          mapping.register_type(/time/i, time)
-          mapping.clear
-
-          assert_not_equal mapping.lookup('time'), time
-        end
-      end
-    end
-  end
-end
-
diff --git a/activerecord/test/cases/type/type_map_test.rb b/activerecord/test/cases/type/type_map_test.rb
new file mode 100644
index 0000000000..4e32f92dd0
--- /dev/null
+++ b/activerecord/test/cases/type/type_map_test.rb
@@ -0,0 +1,130 @@
+require "cases/helper"
+
+module ActiveRecord
+  module Type
+    class TypeMapTest < ActiveRecord::TestCase
+      def test_default_type
+        mapping = TypeMap.new
+
+        assert_kind_of Value, mapping.lookup(:undefined)
+      end
+
+      def test_registering_types
+        boolean = Boolean.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/boolean/i, boolean)
+
+        assert_equal mapping.lookup('boolean'), boolean
+      end
+
+      def test_overriding_registered_types
+        time = Time.new
+        timestamp = DateTime.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/time/i, time)
+        mapping.register_type(/time/i, timestamp)
+
+        assert_equal mapping.lookup('time'), timestamp
+      end
+
+      def test_fuzzy_lookup
+        string = String.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/varchar/i, string)
+
+        assert_equal mapping.lookup('varchar(20)'), string
+      end
+
+      def test_aliasing_types
+        string = String.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/string/i, string)
+        mapping.alias_type(/varchar/i, 'string')
+
+        assert_equal mapping.lookup('varchar'), string
+      end
+
+      def test_changing_type_changes_aliases
+        time = Time.new
+        timestamp = DateTime.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/timestamp/i, time)
+        mapping.alias_type(/datetime/i, 'timestamp')
+        mapping.register_type(/timestamp/i, timestamp)
+
+        assert_equal mapping.lookup('datetime'), timestamp
+      end
+
+      def test_aliases_keep_metadata
+        mapping = TypeMap.new
+
+        mapping.register_type(/decimal/i) { |sql_type| sql_type }
+        mapping.alias_type(/number/i, 'decimal')
+
+        assert_equal mapping.lookup('number(20)'), 'decimal(20)'
+        assert_equal mapping.lookup('number'), 'decimal'
+      end
+
+      def test_register_proc
+        string = String.new
+        binary = Binary.new
+        mapping = TypeMap.new
+
+        mapping.register_type(/varchar/i) do |type|
+          if type.include?('(')
+            string
+          else
+            binary
+          end
+        end
+
+        assert_equal mapping.lookup('varchar(20)'), string
+        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
+
+        assert_raises(ArgumentError) do
+          mapping.register_type(/only key/i)
+        end
+      end
+
+      def test_lookup_non_strings
+        mapping = HashLookupTypeMap.new
+
+        mapping.register_type(1, 'string')
+        mapping.register_type(2, 'int')
+        mapping.alias_type(3, 1)
+
+        assert_equal mapping.lookup(1), 'string'
+        assert_equal mapping.lookup(2), 'int'
+        assert_equal mapping.lookup(3), 'string'
+        assert_kind_of Type::Value, mapping.lookup(4)
+      end
+    end
+  end
+end
+