diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 06:15:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 06:15:00 +0300 |
commit | e3ecb7dc093db47b9491e20d9f20de02b4ac2b6d (patch) | |
tree | e87e5dd85e9c33644b3eddcd47a6214e5537d2c9 /db | |
parent | 4aa6fba6d825b88d23ff37668e78c851bec102b0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
4 files changed, 19 insertions, 3 deletions
diff --git a/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb b/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb index 2238c4e34c5..cd6550d6bad 100644 --- a/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb +++ b/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb @@ -6,7 +6,7 @@ class FinalizeSystemNoteMetadataBigintConversion < Gitlab::Database::Migration[2 disable_ddl_transaction! restrict_gitlab_migration gitlab_schema: :gitlab_main - milestone '16.7' + milestone '16.8' TABLE_NAME = :system_note_metadata diff --git a/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb b/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb new file mode 100644 index 00000000000..948530d4c02 --- /dev/null +++ b/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class DropNoteMentionsTempIndex < Gitlab::Database::Migration[2.2] + disable_ddl_transaction! + + milestone '16.8' + + INDEX_NAME = 'note_mentions_temp_index' + + def up + remove_concurrent_index_by_name :notes, INDEX_NAME + end + + def down + add_concurrent_index :notes, [:id, :noteable_type], where: "note ~~ '%@%'::text", name: INDEX_NAME + end +end diff --git a/db/schema_migrations/20231219044006 b/db/schema_migrations/20231219044006 new file mode 100644 index 00000000000..87c1c9fb980 --- /dev/null +++ b/db/schema_migrations/20231219044006 @@ -0,0 +1 @@ +d48e67240f21ae70e7bae4d1c28fd2070b82e6415539da302248897847678915
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index af8a2cde1a2..775df880e1b 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -35341,8 +35341,6 @@ CREATE UNIQUE INDEX merge_request_user_mentions_on_mr_id_and_note_id_index ON me CREATE UNIQUE INDEX merge_request_user_mentions_on_mr_id_index ON merge_request_user_mentions USING btree (merge_request_id) WHERE (note_id IS NULL); -CREATE INDEX note_mentions_temp_index ON notes USING btree (id, noteable_type) WHERE (note ~~ '%@%'::text); - CREATE UNIQUE INDEX one_canonical_wiki_page_slug_per_metadata ON wiki_page_slugs USING btree (wiki_page_meta_id) WHERE (canonical = true); CREATE INDEX p_ci_builds_scheduled_at_idx ON ONLY p_ci_builds USING btree (scheduled_at) WHERE ((scheduled_at IS NOT NULL) AND ((type)::text = 'Ci::Build'::text) AND ((status)::text = 'scheduled'::text)); |