Merge pull request rails#42786 from composerinteralia/type-map-bugfix

Fix bug with TypeMap default values

Author: byroot

activerecord/lib/active_record/type/type_map.rb

@@ -40,15 +40,15 @@ def alias_type(key, target_key)
       end
 
       protected
-        def perform_fetch(lookup_key)
+        def perform_fetch(lookup_key, &block)
           matching_pair = @mapping.reverse_each.detect do |key, _|
             key === lookup_key
           end
 
           if matching_pair
             matching_pair.last.call(lookup_key)
           elsif @parent
-            @parent.perform_fetch(lookup_key)
+            @parent.perform_fetch(lookup_key, &block)
           else
             yield lookup_key
           end

activerecord/test/cases/type/type_map_test.rb

@@ -143,6 +143,13 @@ def test_parent_fallback
         assert_equal boolean, mapping.lookup("boolean")
       end
 
+      def test_parent_fallback_for_default_type
+        parent = klass.new
+        mapping = klass.new(parent)
+
+        assert_kind_of Value, mapping.lookup(:undefined)
+      end
+
       private
         def klass
           TypeMap