diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 09:08:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 09:08:06 +0000 |
commit | 301f94cc9b9de6ea11e4c1e515aa772c3e468a67 (patch) | |
tree | 4b4f175063d1d8d830053ca9b5a2927ec9cee1d9 /db | |
parent | 712bbb451d1cb52dc6fac04ac0e13feeaaa765bf (diff) | |
download | gitlab-ce-301f94cc9b9de6ea11e4c1e515aa772c3e468a67.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
3 files changed, 21 insertions, 2 deletions
diff --git a/db/post_migrate/20221102231130_finalize_backfill_user_details_fields.rb b/db/post_migrate/20221102231130_finalize_backfill_user_details_fields.rb new file mode 100644 index 00000000000..0ce8f260d06 --- /dev/null +++ b/db/post_migrate/20221102231130_finalize_backfill_user_details_fields.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class FinalizeBackfillUserDetailsFields < Gitlab::Database::Migration[2.0] + BACKFILL_MIGRATION = 'BackfillUserDetailsFields' + + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main + + def up + ensure_batched_background_migration_is_finished( + job_class_name: BACKFILL_MIGRATION, + table_name: :users, + column_name: :id, + job_arguments: [], + finalize: true) + end + + def down; end +end diff --git a/db/post_migrate/20221102231131_remove_temp_index_for_user_details_fields.rb b/db/post_migrate/20221102231131_remove_temp_index_for_user_details_fields.rb index 340d1205ef7..c31513e00fc 100644 --- a/db/post_migrate/20221102231131_remove_temp_index_for_user_details_fields.rb +++ b/db/post_migrate/20221102231131_remove_temp_index_for_user_details_fields.rb @@ -1,13 +1,11 @@ # frozen_string_literal: true class RemoveTempIndexForUserDetailsFields < Gitlab::Database::Migration[2.0] - BACKFILL_MIGRATION = 'BackfillUserDetailsFields' INDEX_NAME = 'tmp_idx_where_user_details_fields_filled' disable_ddl_transaction! def up - finalize_background_migration BACKFILL_MIGRATION remove_concurrent_index_by_name :users, INDEX_NAME end diff --git a/db/schema_migrations/20221102231130 b/db/schema_migrations/20221102231130 new file mode 100644 index 00000000000..ee01f627eef --- /dev/null +++ b/db/schema_migrations/20221102231130 @@ -0,0 +1 @@ +8678040a9fa8da1d455489db89e00084943d1dced6dd01cbf3517afd1a47bac5
\ No newline at end of file |