Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 965ce2bcee9..a269b8d0366 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -72,8 +72,19 @@ module Gitlab
       Gitlab::Application.config.database_configuration[Rails.env].include?(database_name.to_s)
     end
 
+    def self.main_database?(name)
+      # The database is `main` if it is a first entry in `database.yml`
+      # Rails internally names them `primary` to avoid confusion
+      # with broad `primary` usage we use `main` instead
+      #
+      # TODO: The explicit `== 'main'` is needed in a transition period till
+      # the `database.yml` is not migrated into `main:` syntax
+      # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65243
+      ActiveRecord::Base.configurations.primary?(name.to_s) || name.to_s == 'main'
+    end
+
     def self.ci_database?(name)
-      name == CI_DATABASE_NAME
+      name.to_s == CI_DATABASE_NAME
     end
 
     def self.username