diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:42 +0000 |
commit | 403678e00406edc8094f087ec70e00aa29e49bef (patch) | |
tree | 447d6d4967e9a11895683b27e637a50bd9fc0602 /db | |
parent | f5050253469fc0961c02deec0e698ad62bdd9de5 (diff) | |
download | gitlab-ce-403678e00406edc8094f087ec70e00aa29e49bef.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200331132103_add_project_compliance_framework_settings_table.rb | 22 | ||||
-rw-r--r-- | db/migrate/20200401211005_create_operations_user_lists.rb | 18 | ||||
-rw-r--r-- | db/structure.sql | 57 |
3 files changed, 97 insertions, 0 deletions
diff --git a/db/migrate/20200331132103_add_project_compliance_framework_settings_table.rb b/db/migrate/20200331132103_add_project_compliance_framework_settings_table.rb new file mode 100644 index 00000000000..6af8c6db939 --- /dev/null +++ b/db/migrate/20200331132103_add_project_compliance_framework_settings_table.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class AddProjectComplianceFrameworkSettingsTable < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + create_table :project_compliance_framework_settings, id: false do |t| + t.references :project, primary_key: true, null: false, index: true, foreign_key: { on_delete: :cascade } + t.integer :framework, null: false, limit: 2 + end + end + end + + def down + with_lock_retries do + drop_table :project_compliance_framework_settings + end + end +end diff --git a/db/migrate/20200401211005_create_operations_user_lists.rb b/db/migrate/20200401211005_create_operations_user_lists.rb new file mode 100644 index 00000000000..c5b928b8350 --- /dev/null +++ b/db/migrate/20200401211005_create_operations_user_lists.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class CreateOperationsUserLists < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + create_table :operations_user_lists do |t| + t.references :project, index: false, foreign_key: { on_delete: :cascade }, null: false + t.timestamps_with_timezone + t.integer :iid, null: false + t.string :name, null: false, limit: 255 + t.text :user_xids, null: false, default: '' + + t.index [:project_id, :iid], unique: true + t.index [:project_id, :name], unique: true + end + end +end diff --git a/db/structure.sql b/db/structure.sql index a284d001ee5..c2a2e4b361c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -4323,6 +4323,25 @@ CREATE SEQUENCE public.operations_strategies_id_seq ALTER SEQUENCE public.operations_strategies_id_seq OWNED BY public.operations_strategies.id; +CREATE TABLE public.operations_user_lists ( + id bigint NOT NULL, + project_id bigint NOT NULL, + created_at timestamp with time zone NOT NULL, + updated_at timestamp with time zone NOT NULL, + iid integer NOT NULL, + name character varying(255) NOT NULL, + user_xids text DEFAULT ''::text NOT NULL +); + +CREATE SEQUENCE public.operations_user_lists_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +ALTER SEQUENCE public.operations_user_lists_id_seq OWNED BY public.operations_user_lists.id; + CREATE TABLE public.packages_build_infos ( id bigint NOT NULL, package_id integer NOT NULL, @@ -4722,6 +4741,20 @@ CREATE SEQUENCE public.project_ci_cd_settings_id_seq ALTER SEQUENCE public.project_ci_cd_settings_id_seq OWNED BY public.project_ci_cd_settings.id; +CREATE TABLE public.project_compliance_framework_settings ( + project_id bigint NOT NULL, + framework smallint NOT NULL +); + +CREATE SEQUENCE public.project_compliance_framework_settings_project_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +ALTER SEQUENCE public.project_compliance_framework_settings_project_id_seq OWNED BY public.project_compliance_framework_settings.project_id; + CREATE TABLE public.project_custom_attributes ( id integer NOT NULL, created_at timestamp with time zone NOT NULL, @@ -7275,6 +7308,8 @@ ALTER TABLE ONLY public.operations_scopes ALTER COLUMN id SET DEFAULT nextval('p ALTER TABLE ONLY public.operations_strategies ALTER COLUMN id SET DEFAULT nextval('public.operations_strategies_id_seq'::regclass); +ALTER TABLE ONLY public.operations_user_lists ALTER COLUMN id SET DEFAULT nextval('public.operations_user_lists_id_seq'::regclass); + ALTER TABLE ONLY public.packages_build_infos ALTER COLUMN id SET DEFAULT nextval('public.packages_build_infos_id_seq'::regclass); ALTER TABLE ONLY public.packages_conan_file_metadata ALTER COLUMN id SET DEFAULT nextval('public.packages_conan_file_metadata_id_seq'::regclass); @@ -7315,6 +7350,8 @@ ALTER TABLE ONLY public.project_auto_devops ALTER COLUMN id SET DEFAULT nextval( ALTER TABLE ONLY public.project_ci_cd_settings ALTER COLUMN id SET DEFAULT nextval('public.project_ci_cd_settings_id_seq'::regclass); +ALTER TABLE ONLY public.project_compliance_framework_settings ALTER COLUMN project_id SET DEFAULT nextval('public.project_compliance_framework_settings_project_id_seq'::regclass); + ALTER TABLE ONLY public.project_custom_attributes ALTER COLUMN id SET DEFAULT nextval('public.project_custom_attributes_id_seq'::regclass); ALTER TABLE ONLY public.project_daily_statistics ALTER COLUMN id SET DEFAULT nextval('public.project_daily_statistics_id_seq'::regclass); @@ -8081,6 +8118,9 @@ ALTER TABLE ONLY public.operations_scopes ALTER TABLE ONLY public.operations_strategies ADD CONSTRAINT operations_strategies_pkey PRIMARY KEY (id); +ALTER TABLE ONLY public.operations_user_lists + ADD CONSTRAINT operations_user_lists_pkey PRIMARY KEY (id); + ALTER TABLE ONLY public.packages_build_infos ADD CONSTRAINT packages_build_infos_pkey PRIMARY KEY (id); @@ -8144,6 +8184,9 @@ ALTER TABLE ONLY public.project_auto_devops ALTER TABLE ONLY public.project_ci_cd_settings ADD CONSTRAINT project_ci_cd_settings_pkey PRIMARY KEY (id); +ALTER TABLE ONLY public.project_compliance_framework_settings + ADD CONSTRAINT project_compliance_framework_settings_pkey PRIMARY KEY (project_id); + ALTER TABLE ONLY public.project_custom_attributes ADD CONSTRAINT project_custom_attributes_pkey PRIMARY KEY (id); @@ -9644,6 +9687,10 @@ CREATE UNIQUE INDEX index_operations_scopes_on_strategy_id_and_environment_scope CREATE INDEX index_operations_strategies_on_feature_flag_id ON public.operations_strategies USING btree (feature_flag_id); +CREATE UNIQUE INDEX index_operations_user_lists_on_project_id_and_iid ON public.operations_user_lists USING btree (project_id, iid); + +CREATE UNIQUE INDEX index_operations_user_lists_on_project_id_and_name ON public.operations_user_lists USING btree (project_id, name); + CREATE UNIQUE INDEX index_packages_build_infos_on_package_id ON public.packages_build_infos USING btree (package_id); CREATE INDEX index_packages_build_infos_on_pipeline_id ON public.packages_build_infos USING btree (pipeline_id); @@ -9736,6 +9783,8 @@ CREATE UNIQUE INDEX index_project_auto_devops_on_project_id ON public.project_au CREATE UNIQUE INDEX index_project_ci_cd_settings_on_project_id ON public.project_ci_cd_settings USING btree (project_id); +CREATE INDEX index_project_compliance_framework_settings_on_project_id ON public.project_compliance_framework_settings USING btree (project_id); + CREATE INDEX index_project_custom_attributes_on_key_and_value ON public.project_custom_attributes USING btree (key, value); CREATE UNIQUE INDEX index_project_custom_attributes_on_project_id_and_key ON public.project_custom_attributes USING btree (project_id, key); @@ -10956,6 +11005,9 @@ ALTER TABLE ONLY public.project_deploy_tokens ALTER TABLE ONLY public.packages_conan_file_metadata ADD CONSTRAINT fk_rails_0afabd9328 FOREIGN KEY (package_file_id) REFERENCES public.packages_package_files(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.operations_user_lists + ADD CONSTRAINT fk_rails_0c716e079b FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.geo_node_statuses ADD CONSTRAINT fk_rails_0ecc699c2a FOREIGN KEY (geo_node_id) REFERENCES public.geo_nodes(id) ON DELETE CASCADE; @@ -11391,6 +11443,9 @@ ALTER TABLE ONLY public.prometheus_alerts ALTER TABLE ONLY public.term_agreements ADD CONSTRAINT fk_rails_6ea6520e4a FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.project_compliance_framework_settings + ADD CONSTRAINT fk_rails_6f5294f16c FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.users_security_dashboard_projects ADD CONSTRAINT fk_rails_6f6cf8e66e FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; @@ -13002,8 +13057,10 @@ COPY "schema_migrations" (version) FROM STDIN; 20200330121000 20200330123739 20200330132913 +20200331132103 20200331195952 20200331220930 +20200401211005 20200402123926 20200402135250 20200402185044 |