diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 03:09:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 03:09:37 +0300 |
commit | 0ec841b7f902243b832f11b352f215bd93bc680b (patch) | |
tree | efc80df932176a4d9e99377acf720fcdd5f2bf0a /db | |
parent | 82f5f2485b37ea938d11181f3e05ddf35ab1959e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
5 files changed, 115 insertions, 0 deletions
diff --git a/db/migrate/20200420115948_create_metrics_users_starred_dashboard.rb b/db/migrate/20200420115948_create_metrics_users_starred_dashboard.rb new file mode 100644 index 00000000000..27130136e9d --- /dev/null +++ b/db/migrate/20200420115948_create_metrics_users_starred_dashboard.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class CreateMetricsUsersStarredDashboard < ActiveRecord::Migration[6.0] + DOWNTIME = false + + # limit added in following migration db/migrate/20200424101920_add_text_limit_to_metrics_users_starred_dashboards_dashboard_path.rb + # to allow this migration to be run inside the transaction + # rubocop: disable Migration/AddLimitToTextColumns + def up + create_table :metrics_users_starred_dashboards do |t| + t.timestamps_with_timezone + t.bigint :project_id, null: false + t.bigint :user_id, null: false + t.text :dashboard_path, null: false + + t.index :project_id + t.index %i(user_id project_id dashboard_path), name: "idx_metrics_users_starred_dashboard_on_user_project_dashboard", unique: true + end + end + # rubocop: enable Migration/AddLimitToTextColumns + + def down + drop_table :metrics_users_starred_dashboards + end +end diff --git a/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb b/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb new file mode 100644 index 00000000000..c30e753be62 --- /dev/null +++ b/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddForeignKeyFromUsersToMetricsUsersStarredDashboars < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_concurrent_foreign_key :metrics_users_starred_dashboards, :users, column: :user_id, on_delete: :cascade + end + + def down + with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction + remove_foreign_key_if_exists :metrics_users_starred_dashboards, column: :user_id + end + end +end diff --git a/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb b/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb new file mode 100644 index 00000000000..4a4239d7b8c --- /dev/null +++ b/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddForeignKeyFromProjectsToMetricsUsersStarredDashboars < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_concurrent_foreign_key :metrics_users_starred_dashboards, :projects, column: :project_id, on_delete: :cascade + end + + def down + with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction + remove_foreign_key_if_exists :metrics_users_starred_dashboards, column: :project_id + end + end +end diff --git a/db/migrate/20200424101920_add_text_limit_to_metrics_users_starred_dashboards_dashboard_path.rb b/db/migrate/20200424101920_add_text_limit_to_metrics_users_starred_dashboards_dashboard_path.rb new file mode 100644 index 00000000000..a5620fd8e29 --- /dev/null +++ b/db/migrate/20200424101920_add_text_limit_to_metrics_users_starred_dashboards_dashboard_path.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class AddTextLimitToMetricsUsersStarredDashboardsDashboardPath < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_text_limit :metrics_users_starred_dashboards, :dashboard_path, 255 + end + + def down + remove_text_limit :metrics_users_starred_dashboards, :dashboard_path + end +end diff --git a/db/structure.sql b/db/structure.sql index d70c3b86704..cb7c96aeee8 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -4033,6 +4033,25 @@ CREATE SEQUENCE public.metrics_dashboard_annotations_id_seq ALTER SEQUENCE public.metrics_dashboard_annotations_id_seq OWNED BY public.metrics_dashboard_annotations.id; +CREATE TABLE public.metrics_users_starred_dashboards ( + id bigint NOT NULL, + created_at timestamp with time zone NOT NULL, + updated_at timestamp with time zone NOT NULL, + project_id bigint NOT NULL, + user_id bigint NOT NULL, + dashboard_path text NOT NULL, + CONSTRAINT check_79a84a0f57 CHECK ((char_length(dashboard_path) <= 255)) +); + +CREATE SEQUENCE public.metrics_users_starred_dashboards_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +ALTER SEQUENCE public.metrics_users_starred_dashboards_id_seq OWNED BY public.metrics_users_starred_dashboards.id; + CREATE TABLE public.milestone_releases ( milestone_id bigint NOT NULL, release_id bigint NOT NULL @@ -7517,6 +7536,8 @@ ALTER TABLE ONLY public.merge_trains ALTER COLUMN id SET DEFAULT nextval('public ALTER TABLE ONLY public.metrics_dashboard_annotations ALTER COLUMN id SET DEFAULT nextval('public.metrics_dashboard_annotations_id_seq'::regclass); +ALTER TABLE ONLY public.metrics_users_starred_dashboards ALTER COLUMN id SET DEFAULT nextval('public.metrics_users_starred_dashboards_id_seq'::regclass); + ALTER TABLE ONLY public.milestones ALTER COLUMN id SET DEFAULT nextval('public.milestones_id_seq'::regclass); ALTER TABLE ONLY public.namespace_statistics ALTER COLUMN id SET DEFAULT nextval('public.namespace_statistics_id_seq'::regclass); @@ -8327,6 +8348,9 @@ ALTER TABLE ONLY public.merge_trains ALTER TABLE ONLY public.metrics_dashboard_annotations ADD CONSTRAINT metrics_dashboard_annotations_pkey PRIMARY KEY (id); +ALTER TABLE ONLY public.metrics_users_starred_dashboards + ADD CONSTRAINT metrics_users_starred_dashboards_pkey PRIMARY KEY (id); + ALTER TABLE ONLY public.milestones ADD CONSTRAINT milestones_pkey PRIMARY KEY (id); @@ -8842,6 +8866,8 @@ CREATE INDEX idx_merge_requests_on_state_id_and_merge_status ON public.merge_req CREATE INDEX idx_merge_requests_on_target_project_id_and_iid_opened ON public.merge_requests USING btree (target_project_id, iid) WHERE (state_id = 1); +CREATE UNIQUE INDEX idx_metrics_users_starred_dashboard_on_user_project_dashboard ON public.metrics_users_starred_dashboards USING btree (user_id, project_id, dashboard_path); + CREATE INDEX idx_mr_cc_diff_files_on_mr_cc_id_and_sha ON public.merge_request_context_commit_diff_files USING btree (merge_request_context_commit_id, sha); CREATE INDEX idx_packages_packages_on_project_id_name_version_package_type ON public.packages_packages USING btree (project_id, name, version, package_type); @@ -9872,6 +9898,8 @@ CREATE INDEX index_metrics_dashboard_annotations_on_cluster_id_and_3_columns ON CREATE INDEX index_metrics_dashboard_annotations_on_environment_id_and_3_col ON public.metrics_dashboard_annotations USING btree (environment_id, dashboard_path, starting_at, ending_at) WHERE (environment_id IS NOT NULL); +CREATE INDEX index_metrics_users_starred_dashboards_on_project_id ON public.metrics_users_starred_dashboards USING btree (project_id); + CREATE INDEX index_milestone_releases_on_release_id ON public.milestone_releases USING btree (release_id); CREATE INDEX index_milestones_on_description_trigram ON public.milestones USING gin (description public.gin_trgm_ops); @@ -11217,6 +11245,9 @@ ALTER TABLE ONLY public.deployments ALTER TABLE ONLY public.gitlab_subscriptions ADD CONSTRAINT fk_bd0c4019c3 FOREIGN KEY (hosted_plan_id) REFERENCES public.plans(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.metrics_users_starred_dashboards + ADD CONSTRAINT fk_bd6ae32fac FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.snippets ADD CONSTRAINT fk_be41fd4bb7 FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; @@ -11271,6 +11302,9 @@ ALTER TABLE ONLY public.geo_event_log ALTER TABLE ONLY public.lists ADD CONSTRAINT fk_d6cf4279f7 FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.metrics_users_starred_dashboards + ADD CONSTRAINT fk_d76a2b9a8c FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.system_note_metadata ADD CONSTRAINT fk_d83a918cb1 FOREIGN KEY (note_id) REFERENCES public.notes(id) ON DELETE CASCADE; @@ -13578,6 +13612,7 @@ COPY "schema_migrations" (version) FROM STDIN; 20200420094444 20200420104303 20200420104323 +20200420115948 20200420162730 20200420172113 20200420172752 @@ -13591,8 +13626,11 @@ COPY "schema_migrations" (version) FROM STDIN; 20200423080334 20200423080607 20200423081409 +20200423081441 +20200423081519 20200423101529 20200424050250 +20200424101920 20200427064130 \. |