Merge branch 'pb-pass-connection-to-unidirectional-trigger' into 'master'

Pass db connection to UnidirectionalCopyTrigger

See merge request gitlab-org/gitlab!72641

.rubocop_manual_todo.yml

@@ -2454,7 +2454,6 @@ Database/MultipleDatabases:
     - 'lib/gitlab/database/schema_cache_with_renamed_table.rb'
     - 'lib/gitlab/database/schema_migrations/context.rb'
     - 'lib/gitlab/database/schema_version_files.rb'
-    - 'lib/gitlab/database/unidirectional_copy_trigger.rb'
     - 'lib/gitlab/database/with_lock_retries.rb'
     - 'lib/gitlab/gitlab_import/importer.rb'
     - 'lib/gitlab/health_checks/db_check.rb'

db/post_migrate/20210622041846_finalize_push_event_payloads_bigint_conversion.rb

@@ -49,7 +49,7 @@ class FinalizePushEventPayloadsBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:event_id, :event_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:event_id, :event_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210622045705_finalize_events_bigint_conversion.rb

@@ -60,7 +60,7 @@ class FinalizeEventsBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:id, :id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:id, :id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210701033622_finalize_ci_builds_needs_bigint_conversion.rb

@@ -47,7 +47,7 @@ class FinalizeCiBuildsNeedsBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:build_id, :build_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:build_id, :build_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210701141346_finalize_ci_builds_stage_id_bigint_conversion.rb

@@ -46,7 +46,7 @@ class FinalizeCiBuildsStageIdBigintConversion < ActiveRecord::Migration[6.1]
       execute "ALTER TABLE #{quoted_table_name} RENAME COLUMN #{quote_column_name(temporary_name)} TO #{quote_column_name(:stage_id_convert_to_bigint)}"
 
       # Reset the function so PG drops the plan cache for the incorrect integer type
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection)
         .name([:id, :stage_id], [:id_convert_to_bigint, :stage_id_convert_to_bigint])
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 

db/post_migrate/20210706212710_finalize_ci_job_artifacts_bigint_conversion.rb

@@ -58,7 +58,7 @@ class FinalizeCiJobArtifactsBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name([:id, :job_id], [:id_convert_to_bigint, :job_id_convert_to_bigint])
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name([:id, :job_id], [:id_convert_to_bigint, :job_id_convert_to_bigint])
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210707210916_finalize_ci_stages_bigint_conversion.rb

@@ -53,7 +53,7 @@ class FinalizeCiStagesBigintConversion < ActiveRecord::Migration[6.1]
       execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN #{id_convert_to_bigint_name} TO #{id_name}"
       execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN #{temp_name} TO #{id_convert_to_bigint_name}"
 
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:id, :id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:id, :id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210708011426_finalize_ci_builds_metadata_bigint_conversion.rb

@@ -53,8 +53,8 @@ class FinalizeCiBuildsMetadataBigintConversion < Gitlab::Database::Migration[1.0
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      execute "ALTER FUNCTION #{quote_table_name(Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:id, :id_convert_to_bigint))} RESET ALL"
-      execute "ALTER FUNCTION #{quote_table_name(Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:build_id, :build_id_convert_to_bigint))} RESET ALL"
+      execute "ALTER FUNCTION #{quote_table_name(Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:id, :id_convert_to_bigint))} RESET ALL"
+      execute "ALTER FUNCTION #{quote_table_name(Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:build_id, :build_id_convert_to_bigint))} RESET ALL"
 
       # Swap defaults for PK
       execute "ALTER SEQUENCE ci_builds_metadata_id_seq OWNED BY #{TABLE_NAME}.id"

db/post_migrate/20210713042153_finalize_ci_sources_pipelines_bigint_conversion.rb

@@ -47,7 +47,7 @@ class FinalizeCiSourcesPipelinesBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:source_job_id, :source_job_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:source_job_id, :source_job_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # No need to swap defaults, both columns have no default value

db/post_migrate/20210714015537_finalize_ci_build_trace_chunks_bigint_conversion.rb

@@ -45,7 +45,7 @@ class FinalizeCiBuildTraceChunksBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:build_id, :build_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:build_id, :build_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210722155635_finalize_convert_geo_job_artifact_deleted_events_bigint.rb

@@ -44,7 +44,7 @@ class FinalizeConvertGeoJobArtifactDeletedEventsBigint < ActiveRecord::Migration
       change_column_default TABLE_NAME, COLUMN_NAME, nil
       change_column_default TABLE_NAME, COLUMN_NAME_CONVERTED, 0
 
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(COLUMN_NAME, COLUMN_NAME_CONVERTED)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(COLUMN_NAME, COLUMN_NAME_CONVERTED)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       execute "DROP INDEX #{old_index_name}"

db/post_migrate/20210802043253_finalize_push_event_payloads_bigint_conversion_3.rb

@@ -61,7 +61,7 @@ class FinalizePushEventPayloadsBigintConversion3 < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:event_id, :event_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:event_id, :event_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210802131812_finalize_convert_deployments_bigint.rb

@@ -35,7 +35,7 @@ class FinalizeConvertDeploymentsBigint < ActiveRecord::Migration[6.1]
       execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN #{quote_column_name(COLUMN_NAME_BIGINT)} TO #{quote_column_name(COLUMN_NAME)}"
       execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN #{quote_column_name(temp_name)} TO #{quote_column_name(COLUMN_NAME_BIGINT)}"
 
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(COLUMN_NAME, COLUMN_NAME_BIGINT)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(COLUMN_NAME, COLUMN_NAME_BIGINT)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       execute "DROP INDEX #{old_index_name}"

db/post_migrate/20210805131510_finalize_ci_builds_runner_session_bigint_conversion.rb

@@ -44,7 +44,7 @@ class FinalizeCiBuildsRunnerSessionBigintConversion < ActiveRecord::Migration[6.
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name(:build_id, :build_id_convert_to_bigint)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name(:build_id, :build_id_convert_to_bigint)
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210806131706_finalize_taggins_bigint_conversion.rb

@@ -60,7 +60,7 @@ class FinalizeTagginsBigintConversion < ActiveRecord::Migration[6.1]
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name([:id, :taggable_id], [:id_convert_to_bigint, :taggable_id_convert_to_bigint])
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name([:id, :taggable_id], [:id_convert_to_bigint, :taggable_id_convert_to_bigint])
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210809143931_finalize_job_id_conversion_to_bigint_for_ci_job_artifacts.rb

@@ -55,7 +55,7 @@ class FinalizeJobIdConversionToBigintForCiJobArtifacts < ActiveRecord::Migration
       # We need to update the trigger function in order to make PostgreSQL to
       # regenerate the execution plan for it. This is to avoid type mismatch errors like
       # "type of parameter 15 (bigint) does not match that when preparing the plan (integer)"
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME).name([:id, :job_id], [:id_convert_to_bigint, :job_id_convert_to_bigint])
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection).name([:id, :job_id], [:id_convert_to_bigint, :job_id_convert_to_bigint])
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 
       # Swap defaults

db/post_migrate/20210907211557_finalize_ci_builds_bigint_conversion.rb

@@ -136,7 +136,7 @@ class FinalizeCiBuildsBigintConversion < Gitlab::Database::Migration[1.0]
       execute "ALTER TABLE #{quoted_table_name} RENAME COLUMN #{quote_column_name(temporary_name)} TO #{quote_column_name(:id_convert_to_bigint)}"
 
       # Reset the function so PG drops the plan cache for the incorrect integer type
-      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME)
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger.on_table(TABLE_NAME, connection: connection)
         .name([:id, :stage_id], [:id_convert_to_bigint, :stage_id_convert_to_bigint])
       execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
 

lib/gitlab/database/unidirectional_copy_trigger.rb

@@ -3,7 +3,7 @@
 module Gitlab
   module Database
     class UnidirectionalCopyTrigger
-      def self.on_table(table_name, connection: ActiveRecord::Base.connection)
+      def self.on_table(table_name, connection:)
         new(table_name, connection)
       end
 

spec/lib/gitlab/database/unidirectional_copy_trigger_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Database::UnidirectionalCopyTrigger do
 
   let(:table_name) { '_test_table' }
   let(:connection) { ActiveRecord::Base.connection }
-  let(:copy_trigger) { described_class.on_table(table_name) }
+  let(:copy_trigger) { described_class.on_table(table_name, connection: connection) }
 
   describe '#name' do
     context 'when a single column name is given' do