Revert "PERF: optimise type lookup to avoid invoking procs"

This reverts commit da99a2a2982d35f670ad9647463e09bfe9032b70.

2 files changed, 8 insertions, 32 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index d3e5b0a4ad..6310d70192 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -431,22 +431,16 @@ module ActiveRecord
       private
 
         def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
-
-          result = type_map.fetch(oid, fmod, sql_type) {
-            nil
-          }
-
-          unless result
+          if !type_map.key?(oid)
             load_additional_types(type_map, [oid])
-            result = type_map.fetch(oid, fmod, sql_type) {
-              warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
-              Type::Value.new.tap do |cast_type|
-                type_map.register_type(oid, cast_type)
-              end
-            }
           end
 
-          result
+          type_map.fetch(oid, fmod, sql_type) {
+            warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
+            Type::Value.new.tap do |cast_type|
+              type_map.register_type(oid, cast_type)
+            end
+          }
         end
 
         def initialize_type_map(m) # :nodoc:
diff --git a/activerecord/lib/active_record/type/hash_lookup_type_map.rb b/activerecord/lib/active_record/type/hash_lookup_type_map.rb
index 2a146d38a9..bf92680268 100644
--- a/activerecord/lib/active_record/type/hash_lookup_type_map.rb
+++ b/activerecord/lib/active_record/type/hash_lookup_type_map.rb
@@ -1,12 +1,6 @@
 module ActiveRecord
   module Type
     class HashLookupTypeMap < TypeMap # :nodoc:
-
-      def initialize
-        @cache = {}
-        super
-      end
-
       delegate :key?, to: :@mapping
 
       def lookup(type, *args)
@@ -14,24 +8,12 @@ module ActiveRecord
       end
 
       def fetch(type, *args, &block)
-        cache = (@cache[type] ||= {})
-        resolved = cache[args]
-
-        unless resolved
-          resolved = cache[args] = @mapping.fetch(type, block).call(type, *args)
-        end
-
-        resolved
+        @mapping.fetch(type, block).call(type, *args)
       end
 
       def alias_type(type, alias_type)
         register_type(type) { |_, *args| lookup(alias_type, *args) }
       end
-
-      def register_type(key, value=nil, &block)
-        @cache = {}
-        super(key, value, &block)
-      end
     end
   end
 end