Merge branch 'morefice/fix-finalize-background-migration-database-name' into 'master'

Fix OverdueFinalizeBackgroundMigration#database_name

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184021



Merged-by: Omar Qunsul <oqunsul@gitlab.com>
Approved-by: Omar Qunsul <oqunsul@gitlab.com>
Approved-by: Bishwa Hang Rai <bhrai@gitlab.com>
Co-authored-by: Maxime Orefice <morefice@gitlab.com>

keeps/overdue_finalize_background_migration.rb

@@ -272,10 +272,10 @@ def migration_code_in_ee?(file_name)
       )
     end
 
-    private
-
     def database_name(migration_record)
-      migration_record.gitlab_schema.split("_").last
+      gitlab_schema = migration_record.gitlab_schema
+      connection = Gitlab::Database.schemas_to_base_models[gitlab_schema].first.connection
+      Gitlab::Database.db_config_name(connection)
     end
   end
 end

spec/keeps/overdue_finalize_background_migration_spec.rb

@@ -96,4 +96,36 @@
       end
     end
   end
+
+  describe '#database_name' do
+    let(:migration_record) do
+      MigrationRecord.new(id: 1, finished_at: "2020-04-01 12:00:01", gitlab_schema: gitlab_schema)
+    end
+
+    subject(:database_name) { keep.database_name(migration_record) }
+
+    context 'when schema is gitlab_main_cell' do
+      let(:gitlab_schema) { 'gitlab_main_cell' }
+
+      it 'returns the database name' do
+        expect(database_name).to eq('main')
+      end
+    end
+
+    context 'when schema is gitlab_main' do
+      let(:gitlab_schema) { 'gitlab_main' }
+
+      it 'returns the database name' do
+        expect(database_name).to eq('main')
+      end
+    end
+
+    context 'when schema is gitlab_ci' do
+      let(:gitlab_schema) { 'gitlab_ci' }
+
+      it 'returns the database name' do
+        expect(database_name).to eq('ci')
+      end
+    end
+  end
 end