Merge branch '331786-enable-typemap-cache' into 'master'

Enable caching of PG typemap by default

See merge request gitlab-org/gitlab!64010

config/initializers/active_record_postgresql_adapter.rb

@@ -4,6 +4,6 @@ if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_EMPTY_PING'], default: true
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::EmptyQueryPing)
 end
 
-if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_TYPEMAP_CACHE'], default: false)
+if Gitlab::Utils.to_boolean(ENV['ENABLE_ACTIVERECORD_TYPEMAP_CACHE'], default: true)
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Database::PostgresqlAdapter::TypeMapCache)
 end

spec/lib/gitlab/database/postgresql_adapter/type_map_cache_spec.rb

@@ -4,20 +4,17 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Database::PostgresqlAdapter::TypeMapCache do
   let(:db_config) { ActiveRecord::Base.configurations.configs_for(env_name: 'test', name: 'primary').configuration_hash }
-  let(:adapter_class) do
-    Class.new(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  let(:adapter_class) { ActiveRecord::ConnectionAdapters::PostgreSQLAdapter }
+
+  before do
+    adapter_class.type_map_cache.clear
   end
 
   describe '#initialize_type_map' do
     it 'caches loading of types in memory' do
-      initialize_connection.disconnect!
       recorder_without_cache = ActiveRecord::QueryRecorder.new(skip_schema_queries: false) { initialize_connection.disconnect! }
-
       expect(recorder_without_cache.log).to include(a_string_matching(/FROM pg_type/)).twice
 
-      adapter_class.prepend(described_class)
-
-      initialize_connection.disconnect!
       recorder_with_cache = ActiveRecord::QueryRecorder.new(skip_schema_queries: false) { initialize_connection.disconnect! }
 
       expect(recorder_with_cache.count).to be < recorder_without_cache.count
@@ -29,8 +26,6 @@ RSpec.describe Gitlab::Database::PostgresqlAdapter::TypeMapCache do
     end
 
     it 'only reuses the cache if the connection parameters are exactly the same' do
-      adapter_class.prepend(described_class)
-
       initialize_connection.disconnect!
 
       other_config = db_config.dup
@@ -44,8 +39,6 @@ RSpec.describe Gitlab::Database::PostgresqlAdapter::TypeMapCache do
 
   describe '#reload_type_map' do
     it 'clears the cache and executes the type map query again' do
-      adapter_class.prepend(described_class)
-
       initialize_connection.disconnect!
 
       connection = initialize_connection