Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 59249c8bc1f..aa419d75df2 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -9,12 +9,12 @@ module Gitlab
     #   'old_name' => 'new_name'
     # }.freeze
     TABLES_TO_BE_RENAMED = {
-      'analytics_instance_statistics_measurements' => 'analytics_usage_trends_measurements'
+      'services' => 'integrations'
     }.freeze
 
     # Minimum PostgreSQL version requirement per documentation:
     # https://docs.gitlab.com/ee/install/requirements.html#postgresql-requirements
-    MINIMUM_POSTGRES_VERSION = 11
+    MINIMUM_POSTGRES_VERSION = 12
 
     # https://www.postgresql.org/docs/9.2/static/datatype-numeric.html
     MAX_INT_VALUE = 2147483647
@@ -60,7 +60,7 @@ module Gitlab
     end
 
     def self.config
-      default_config_hash = ActiveRecord::Base.configurations.find_db_config(Rails.env)&.config || {}
+      default_config_hash = ActiveRecord::Base.configurations.find_db_config(Rails.env)&.configuration_hash || {}
 
       default_config_hash.with_indifferent_access.tap do |hash|
         # Match config/initializers/database_config.rb
@@ -88,6 +88,11 @@ module Gitlab
       end
     end
 
+    # Disables prepared statements for the current database connection.
+    def self.disable_prepared_statements
+      ActiveRecord::Base.establish_connection(config.merge(prepared_statements: false))
+    end
+
     # @deprecated
     def self.postgresql?
       adapter_name.casecmp('postgresql') == 0
@@ -142,7 +147,7 @@ module Gitlab
           is required for this version of GitLab.
           <% if Rails.env.development? || Rails.env.test? %>
           If using gitlab-development-kit, please find the relevant steps here:
-            https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/master/doc/howto/postgresql.md#upgrade-postgresql
+            https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/postgresql.md#upgrade-postgresql
           <% end %>
           Please upgrade your environment to a supported PostgreSQL version, see
           https://docs.gitlab.com/ee/install/requirements.html#database for details.
@@ -288,7 +293,7 @@ module Gitlab
     # @param [ActiveRecord::Connection] ar_connection
     # @return [String]
     def self.get_write_location(ar_connection)
-      use_new_load_balancer_query = Gitlab::Utils.to_boolean(ENV['USE_NEW_LOAD_BALANCER_QUERY'], default: false)
+      use_new_load_balancer_query = Gitlab::Utils.to_boolean(ENV['USE_NEW_LOAD_BALANCER_QUERY'], default: true)
 
       sql = if use_new_load_balancer_query
               <<~NEWSQL