diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /db | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) | |
download | gitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'db')
30 files changed, 616 insertions, 108 deletions
diff --git a/db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb b/db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb index 0c536f917ce..acb6d04126e 100644 --- a/db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb +++ b/db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb @@ -4,11 +4,15 @@ class AddPagesAccessLevelToProjectFeature < ActiveRecord::Migration[4.2] DOWNTIME = false + # rubocop: disable Migration/UpdateLargeTable + # rubocop: disable Migration/AddColumnWithDefault def up add_column_with_default(:project_features, :pages_access_level, :integer, default: ProjectFeature::PUBLIC, allow_null: false) change_column_default(:project_features, :pages_access_level, ProjectFeature::ENABLED) end + # rubocop: enable Migration/UpdateLargeTable + # rubocop: enable Migration/AddColumnWithDefault def down remove_column :project_features, :pages_access_level diff --git a/db/migrate/20200406165950_add_not_null_constraint_on_file_store_to_lfs_objects.rb b/db/migrate/20200406165950_add_not_null_constraint_on_file_store_to_lfs_objects.rb deleted file mode 100644 index 78b5832fea4..00000000000 --- a/db/migrate/20200406165950_add_not_null_constraint_on_file_store_to_lfs_objects.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class AddNotNullConstraintOnFileStoreToLfsObjects < ActiveRecord::Migration[6.0] - include Gitlab::Database::MigrationHelpers - - CONSTRAINT_NAME = 'lfs_objects_file_store_not_null' - DOWNTIME = false - - def up - with_lock_retries do - execute <<~SQL - ALTER TABLE lfs_objects ADD CONSTRAINT #{CONSTRAINT_NAME} CHECK (file_store IS NOT NULL) NOT VALID; - SQL - end - end - - def down - with_lock_retries do - execute <<~SQL - ALTER TABLE lfs_objects DROP CONSTRAINT IF EXISTS #{CONSTRAINT_NAME}; - SQL - end - end -end diff --git a/db/migrate/20200406171857_add_not_null_constraint_on_file_store_to_ci_job_artifacts.rb b/db/migrate/20200406171857_add_not_null_constraint_on_file_store_to_ci_job_artifacts.rb deleted file mode 100644 index 1d44e5c17b3..00000000000 --- a/db/migrate/20200406171857_add_not_null_constraint_on_file_store_to_ci_job_artifacts.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class AddNotNullConstraintOnFileStoreToCiJobArtifacts < ActiveRecord::Migration[6.0] - include Gitlab::Database::MigrationHelpers - - CONSTRAINT_NAME = 'ci_job_artifacts_file_store_not_null' - DOWNTIME = false - - def up - with_lock_retries do - execute <<~SQL - ALTER TABLE ci_job_artifacts ADD CONSTRAINT #{CONSTRAINT_NAME} CHECK (file_store IS NOT NULL) NOT VALID; - SQL - end - end - - def down - with_lock_retries do - execute <<~SQL - ALTER TABLE ci_job_artifacts DROP CONSTRAINT IF EXISTS #{CONSTRAINT_NAME}; - SQL - end - end -end diff --git a/db/migrate/20200406172135_add_not_null_constraint_on_file_store_to_uploads.rb b/db/migrate/20200406172135_add_not_null_constraint_on_file_store_to_uploads.rb deleted file mode 100644 index aa498ba9c89..00000000000 --- a/db/migrate/20200406172135_add_not_null_constraint_on_file_store_to_uploads.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class AddNotNullConstraintOnFileStoreToUploads < ActiveRecord::Migration[6.0] - include Gitlab::Database::MigrationHelpers - - CONSTRAINT_NAME = 'uploads_store_not_null' - DOWNTIME = false - - def up - with_lock_retries do - execute <<~SQL - ALTER TABLE uploads ADD CONSTRAINT #{CONSTRAINT_NAME} CHECK (store IS NOT NULL) NOT VALID; - SQL - end - end - - def down - with_lock_retries do - execute <<~SQL - ALTER TABLE uploads DROP CONSTRAINT IF EXISTS #{CONSTRAINT_NAME}; - SQL - end - end -end diff --git a/db/migrate/20200407120000_add_push_rule_id_to_groups.rb b/db/migrate/20200407120000_add_push_rule_id_to_groups.rb new file mode 100644 index 00000000000..4b4e99052aa --- /dev/null +++ b/db/migrate/20200407120000_add_push_rule_id_to_groups.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddPushRuleIdToGroups < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column :namespaces, :push_rule_id, :bigint + end + end + + def down + with_lock_retries do + remove_column :namespaces, :push_rule_id + end + end +end diff --git a/db/migrate/20200407121321_add_push_rule_foreign_key_to_groups.rb b/db/migrate/20200407121321_add_push_rule_foreign_key_to_groups.rb new file mode 100644 index 00000000000..acc74b43659 --- /dev/null +++ b/db/migrate/20200407121321_add_push_rule_foreign_key_to_groups.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddPushRuleForeignKeyToGroups < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_concurrent_index :namespaces, :push_rule_id, unique: true + add_concurrent_foreign_key :namespaces, :push_rules, column: :push_rule_id, on_delete: :nullify + end + + def down + remove_foreign_key_if_exists :namespaces, column: :push_rule_id + remove_concurrent_index :namespaces, :push_rule_id + end +end diff --git a/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb b/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..69222710026 --- /dev/null +++ b/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# rubocop: disable Migration/AddConcurrentForeignKey +# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction +class AddProtectedTagCreateAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_tag_create_access_levels_user_id' + + disable_ddl_transaction! + + def up + with_lock_retries do + add_foreign_key(:protected_tag_create_access_levels, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME) + remove_foreign_key_if_exists(:protected_tag_create_access_levels, column: :user_id, on_delete: nil) + end + end + + def down + fk_exists = foreign_key_exists?(:protected_tag_create_access_levels, :users, column: :user_id, on_delete: nil) + + unless fk_exists + with_lock_retries do + add_foreign_key(:protected_tag_create_access_levels, :users, column: :user_id, validate: false) + end + end + + remove_foreign_key_if_exists(:protected_tag_create_access_levels, column: :user_id, name: CONSTRAINT_NAME) + + fk_name = concurrent_foreign_key_name(:protected_tag_create_access_levels, :user_id, prefix: 'fk_rails_') + validate_foreign_key(:protected_tag_create_access_levels, :user_id, name: fk_name) + end +end diff --git a/db/migrate/20200407171417_validate_protected_tag_create_access_levels_user_id_foreign_key.rb b/db/migrate/20200407171417_validate_protected_tag_create_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..baba65e0b7d --- /dev/null +++ b/db/migrate/20200407171417_validate_protected_tag_create_access_levels_user_id_foreign_key.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class ValidateProtectedTagCreateAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_tag_create_access_levels_user_id' + + def up + validate_foreign_key :protected_tag_create_access_levels, :user_id, name: CONSTRAINT_NAME + end + + def down + # no op + end +end diff --git a/db/migrate/20200408133211_add_index_on_route_path_trigram.rb b/db/migrate/20200408133211_add_index_on_route_path_trigram.rb new file mode 100644 index 00000000000..3329252bbd3 --- /dev/null +++ b/db/migrate/20200408133211_add_index_on_route_path_trigram.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddIndexOnRoutePathTrigram < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + INDEX_NAME = 'index_routes_on_path_trigram' + + disable_ddl_transaction! + + def up + add_concurrent_index :routes, :path, name: INDEX_NAME, using: :gin, opclass: { path: :gin_trgm_ops } + end + + def down + remove_concurrent_index_by_name(:routes, INDEX_NAME) + end +end diff --git a/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..1b31da93fe7 --- /dev/null +++ b/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# rubocop: disable Migration/AddConcurrentForeignKey +# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction +class AddProtectedBranchMergeAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_branch_merge_access_levels_user_id' + + disable_ddl_transaction! + + def up + with_lock_retries do + add_foreign_key(:protected_branch_merge_access_levels, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME) + remove_foreign_key_if_exists(:protected_branch_merge_access_levels, column: :user_id, on_delete: nil) + end + end + + def down + fk_exists = foreign_key_exists?(:protected_branch_merge_access_levels, :users, column: :user_id, on_delete: nil) + + unless fk_exists + with_lock_retries do + add_foreign_key(:protected_branch_merge_access_levels, :users, column: :user_id, validate: false) + end + end + + remove_foreign_key_if_exists(:protected_branch_merge_access_levels, column: :user_id, name: CONSTRAINT_NAME) + + fk_name = concurrent_foreign_key_name(:protected_branch_merge_access_levels, :user_id, prefix: 'fk_rails_') + validate_foreign_key(:protected_branch_merge_access_levels, :user_id, name: fk_name) + end +end diff --git a/db/migrate/20200408154349_validate_protected_branch_merge_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154349_validate_protected_branch_merge_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..c4ec957d607 --- /dev/null +++ b/db/migrate/20200408154349_validate_protected_branch_merge_access_levels_user_id_foreign_key.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class ValidateProtectedBranchMergeAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_branch_merge_access_levels_user_id' + + def up + validate_foreign_key :protected_branch_merge_access_levels, :user_id, name: CONSTRAINT_NAME + end + + def down + # no op + end +end diff --git a/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb b/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb new file mode 100644 index 00000000000..5cab846d281 --- /dev/null +++ b/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# rubocop: disable Migration/AddConcurrentForeignKey +# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction +class AddPathLocksUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_path_locks_user_id' + + disable_ddl_transaction! + + def up + with_lock_retries do + add_foreign_key(:path_locks, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME) + remove_foreign_key_if_exists(:path_locks, column: :user_id, on_delete: nil) + end + end + + def down + fk_exists = foreign_key_exists?(:path_locks, :users, column: :user_id, on_delete: nil) + + unless fk_exists + with_lock_retries do + add_foreign_key(:path_locks, :users, column: :user_id, validate: false) + end + end + + remove_foreign_key_if_exists(:path_locks, column: :user_id, name: CONSTRAINT_NAME) + + fk_name = concurrent_foreign_key_name(:path_locks, :user_id, prefix: 'fk_rails_') + validate_foreign_key(:path_locks, :user_id, name: fk_name) + end +end diff --git a/db/migrate/20200408154428_validate_path_locks_user_id_foreign_key.rb b/db/migrate/20200408154428_validate_path_locks_user_id_foreign_key.rb new file mode 100644 index 00000000000..500409ee44a --- /dev/null +++ b/db/migrate/20200408154428_validate_path_locks_user_id_foreign_key.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class ValidatePathLocksUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_path_locks_user_id' + + def up + validate_foreign_key :path_locks, :user_id, name: CONSTRAINT_NAME + end + + def down + # no op + end +end diff --git a/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..c0c844b8853 --- /dev/null +++ b/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# rubocop: disable Migration/AddConcurrentForeignKey +# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction +class AddProtectedBranchPushAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_branch_push_access_levels_user_id' + + disable_ddl_transaction! + + def up + with_lock_retries do + add_foreign_key(:protected_branch_push_access_levels, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME) + remove_foreign_key_if_exists(:protected_branch_push_access_levels, column: :user_id, on_delete: nil) + end + end + + def down + fk_exists = foreign_key_exists?(:protected_branch_push_access_levels, :users, column: :user_id, on_delete: nil) + + unless fk_exists + with_lock_retries do + add_foreign_key(:protected_branch_push_access_levels, :users, column: :user_id, validate: false) + end + end + + remove_foreign_key_if_exists(:protected_branch_push_access_levels, column: :user_id, name: CONSTRAINT_NAME) + + fk_name = concurrent_foreign_key_name(:protected_branch_push_access_levels, :user_id, prefix: 'fk_rails_') + validate_foreign_key(:protected_branch_push_access_levels, :user_id, name: fk_name) + end +end diff --git a/db/migrate/20200408154533_validate_protected_branch_push_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154533_validate_protected_branch_push_access_levels_user_id_foreign_key.rb new file mode 100644 index 00000000000..d6f9cab6d7e --- /dev/null +++ b/db/migrate/20200408154533_validate_protected_branch_push_access_levels_user_id_foreign_key.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class ValidateProtectedBranchPushAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_protected_branch_push_access_levels_user_id' + + def up + validate_foreign_key :protected_branch_push_access_levels, :user_id, name: CONSTRAINT_NAME + end + + def down + # no op + end +end diff --git a/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb new file mode 100644 index 00000000000..0dc8a967955 --- /dev/null +++ b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# rubocop: disable Migration/AddConcurrentForeignKey +# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction +class AddU2fRegistrationsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_u2f_registrations_user_id' + + disable_ddl_transaction! + + def up + with_lock_retries do + add_foreign_key(:u2f_registrations, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME) + remove_foreign_key_if_exists(:u2f_registrations, column: :user_id, on_delete: nil) + end + end + + def down + fk_exists = foreign_key_exists?(:u2f_registrations, :users, column: :user_id, on_delete: nil) + + unless fk_exists + with_lock_retries do + add_foreign_key(:u2f_registrations, :users, column: :user_id, validate: false) + end + end + + remove_foreign_key_if_exists(:u2f_registrations, column: :user_id, name: CONSTRAINT_NAME) + + fk_name = concurrent_foreign_key_name(:u2f_registrations, :user_id, prefix: 'fk_rails_') + validate_foreign_key(:u2f_registrations, :user_id, name: fk_name) + end +end diff --git a/db/migrate/20200408154624_validate_u2f_registrations_user_id_foreign_key.rb b/db/migrate/20200408154624_validate_u2f_registrations_user_id_foreign_key.rb new file mode 100644 index 00000000000..ff723a4793f --- /dev/null +++ b/db/migrate/20200408154624_validate_u2f_registrations_user_id_foreign_key.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true +# +class ValidateU2fRegistrationsUserIdForeignKey < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + CONSTRAINT_NAME = 'fk_u2f_registrations_user_id' + + def up + validate_foreign_key :u2f_registrations, :user_id, name: CONSTRAINT_NAME + end + + def down + # no op + end +end diff --git a/db/migrate/20200408212219_add_status_page_url_to_status_page_settings.rb b/db/migrate/20200408212219_add_status_page_url_to_status_page_settings.rb new file mode 100644 index 00000000000..3b3849c109c --- /dev/null +++ b/db/migrate/20200408212219_add_status_page_url_to_status_page_settings.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddStatusPageUrlToStatusPageSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column :status_page_settings, :status_page_url, :text + add_text_limit :status_page_settings, :status_page_url, 1024 + end + + def down + remove_column :status_page_settings, :status_page_url + end +end diff --git a/db/migrate/20200409085956_add_partial_index_on_import_failures_retry_count.rb b/db/migrate/20200409085956_add_partial_index_on_import_failures_retry_count.rb new file mode 100644 index 00000000000..0999f7b4c95 --- /dev/null +++ b/db/migrate/20200409085956_add_partial_index_on_import_failures_retry_count.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddPartialIndexOnImportFailuresRetryCount < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :import_failures, [:project_id, :correlation_id_value], where: 'retry_count = 0' + end + + def down + remove_concurrent_index :import_failures, [:project_id, :correlation_id_value] + end +end diff --git a/db/migrate/20200410232012_add_metrics_dashboard_access_level_to_project_feature.rb b/db/migrate/20200410232012_add_metrics_dashboard_access_level_to_project_feature.rb new file mode 100644 index 00000000000..2953cdf3429 --- /dev/null +++ b/db/migrate/20200410232012_add_metrics_dashboard_access_level_to_project_feature.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddMetricsDashboardAccessLevelToProjectFeature < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column :project_features, :metrics_dashboard_access_level, :integer + end + end + + def down + with_lock_retries do + remove_column :project_features, :metrics_dashboard_access_level, :integer + end + end +end diff --git a/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb b/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb new file mode 100644 index 00000000000..eea564d00f4 --- /dev/null +++ b/db/migrate/20200413072059_add_group_owners_can_manage_default_branch_protection_to_application_settings.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddGroupOwnersCanManageDefaultBranchProtectionToApplicationSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + disable_ddl_transaction! + + def up + add_column_with_default(:application_settings, + :group_owners_can_manage_default_branch_protection, + :boolean, + default: true) + end + + def down + remove_column :application_settings, :group_owners_can_manage_default_branch_protection + end +end diff --git a/db/migrate/20200414144547_remove_index_projects_on_creator_id_and_created_at_from_projects.rb b/db/migrate/20200414144547_remove_index_projects_on_creator_id_and_created_at_from_projects.rb new file mode 100644 index 00000000000..c4409fcc55d --- /dev/null +++ b/db/migrate/20200414144547_remove_index_projects_on_creator_id_and_created_at_from_projects.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class RemoveIndexProjectsOnCreatorIdAndCreatedAtFromProjects < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + INDEX_NAME = 'index_projects_on_creator_id_and_created_at' + + disable_ddl_transaction! + + def up + remove_concurrent_index_by_name :projects, INDEX_NAME + end + + def down + add_concurrent_index :projects, [:creator_id, :created_at], name: INDEX_NAME + end +end diff --git a/db/migrate/20200415160722_remove_not_null_lfs_objects_constraint.rb b/db/migrate/20200415160722_remove_not_null_lfs_objects_constraint.rb new file mode 100644 index 00000000000..58cfa8e8969 --- /dev/null +++ b/db/migrate/20200415160722_remove_not_null_lfs_objects_constraint.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class RemoveNotNullLfsObjectsConstraint < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + execute <<~SQL + ALTER TABLE lfs_objects DROP CONSTRAINT IF EXISTS lfs_objects_file_store_not_null; + SQL + end + end + + def down + # No-op + end +end diff --git a/db/migrate/20200415161021_remove_not_null_ci_job_artifacts_constraint.rb b/db/migrate/20200415161021_remove_not_null_ci_job_artifacts_constraint.rb new file mode 100644 index 00000000000..65430c180ce --- /dev/null +++ b/db/migrate/20200415161021_remove_not_null_ci_job_artifacts_constraint.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class RemoveNotNullCiJobArtifactsConstraint < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + execute <<~SQL + ALTER TABLE ci_job_artifacts DROP CONSTRAINT IF EXISTS ci_job_artifacts_file_store_not_null; + SQL + end + end + + def down + # No-op + end +end diff --git a/db/migrate/20200415161206_remove_not_null_uploads_constraint.rb b/db/migrate/20200415161206_remove_not_null_uploads_constraint.rb new file mode 100644 index 00000000000..23f202bac7e --- /dev/null +++ b/db/migrate/20200415161206_remove_not_null_uploads_constraint.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class RemoveNotNullUploadsConstraint < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + execute <<~SQL + ALTER TABLE uploads DROP CONSTRAINT IF EXISTS uploads_store_not_null; + SQL + end + end + + def down + # No-op + end +end diff --git a/db/migrate/20200415192656_add_name_regex_keep_to_container_expiration_policies.rb b/db/migrate/20200415192656_add_name_regex_keep_to_container_expiration_policies.rb new file mode 100644 index 00000000000..e223d94caf7 --- /dev/null +++ b/db/migrate/20200415192656_add_name_regex_keep_to_container_expiration_policies.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class AddNameRegexKeepToContainerExpirationPolicies < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + CONSTRAINT_NAME = 'container_expiration_policies_name_regex_keep' + + def up + add_column(:container_expiration_policies, :name_regex_keep, :text) + add_text_limit(:container_expiration_policies, :name_regex_keep, 255, constraint_name: CONSTRAINT_NAME) + end + + def down + remove_check_constraint(:container_expiration_policies, CONSTRAINT_NAME) + remove_column(:container_expiration_policies, :name_regex_keep) + end +end diff --git a/db/migrate/20200416120128_add_columns_to_terraform_state.rb b/db/migrate/20200416120128_add_columns_to_terraform_state.rb new file mode 100644 index 00000000000..e657b1fde3f --- /dev/null +++ b/db/migrate/20200416120128_add_columns_to_terraform_state.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddColumnsToTerraformState < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :terraform_states, :lock_xid, :string, limit: 255 + add_column :terraform_states, :locked_at, :datetime_with_timezone + add_column :terraform_states, :locked_by_user_id, :bigint + add_column :terraform_states, :uuid, :string, limit: 32, null: false # rubocop:disable Rails/NotNullColumn (table not used yet) + add_column :terraform_states, :name, :string, limit: 255 + add_index :terraform_states, :locked_by_user_id # rubocop:disable Migration/AddIndex (table not used yet) + add_index :terraform_states, :uuid, unique: true # rubocop:disable Migration/AddIndex (table not used yet) + add_index :terraform_states, [:project_id, :name], unique: true # rubocop:disable Migration/AddIndex (table not used yet) + remove_index :terraform_states, :project_id # rubocop:disable Migration/RemoveIndex (table not used yet) + end +end diff --git a/db/migrate/20200416120354_add_locked_by_user_id_foreign_key_to_terraform_state.rb b/db/migrate/20200416120354_add_locked_by_user_id_foreign_key_to_terraform_state.rb new file mode 100644 index 00000000000..ecee028351a --- /dev/null +++ b/db/migrate/20200416120354_add_locked_by_user_id_foreign_key_to_terraform_state.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddLockedByUserIdForeignKeyToTerraformState < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_foreign_key :terraform_states, :users, column: :locked_by_user_id # rubocop:disable Migration/AddConcurrentForeignKey + end + end + + def down + with_lock_retries do + remove_foreign_key :terraform_states, column: :locked_by_user_id + end + end +end diff --git a/db/post_migrate/20200406193427_add_index_to_issues_health_status.rb b/db/post_migrate/20200406193427_add_index_to_issues_health_status.rb new file mode 100644 index 00000000000..83baf5b6d75 --- /dev/null +++ b/db/post_migrate/20200406193427_add_index_to_issues_health_status.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class AddIndexToIssuesHealthStatus < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + INDEX_NAME = 'idx_issues_on_health_status_not_null' + + disable_ddl_transaction! + + def up + add_concurrent_index( + :issues, + :health_status, + where: 'health_status IS NOT NULL', + name: INDEX_NAME + ) + end + + def down + remove_concurrent_index_by_name(:issues, INDEX_NAME) + end +end diff --git a/db/structure.sql b/db/structure.sql index 78f54a0f603..52852117fa6 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -400,7 +400,8 @@ CREATE TABLE public.application_settings ( seat_link_enabled boolean DEFAULT true NOT NULL, container_expiration_policies_enable_historic_entries boolean DEFAULT false NOT NULL, issues_create_limit integer DEFAULT 300 NOT NULL, - push_rule_id bigint + push_rule_id bigint, + group_owners_can_manage_default_branch_protection boolean DEFAULT true NOT NULL ); CREATE SEQUENCE public.application_settings_id_seq @@ -1867,7 +1868,9 @@ CREATE TABLE public.container_expiration_policies ( cadence character varying(12) DEFAULT '7d'::character varying NOT NULL, older_than character varying(12), keep_n integer, - enabled boolean DEFAULT true NOT NULL + enabled boolean DEFAULT true NOT NULL, + name_regex_keep text, + CONSTRAINT container_expiration_policies_name_regex_keep CHECK ((char_length(name_regex_keep) <= 255)) ); CREATE TABLE public.container_repositories ( @@ -4051,7 +4054,8 @@ CREATE TABLE public.namespaces ( mentions_disabled boolean, default_branch_protection smallint, unlock_membership_to_ldap boolean, - max_personal_access_token_lifetime integer + max_personal_access_token_lifetime integer, + push_rule_id bigint ); CREATE SEQUENCE public.namespaces_id_seq @@ -4884,7 +4888,8 @@ CREATE TABLE public.project_features ( updated_at timestamp without time zone, repository_access_level integer DEFAULT 20 NOT NULL, pages_access_level integer NOT NULL, - forking_access_level integer + forking_access_level integer, + metrics_dashboard_access_level integer ); CREATE SEQUENCE public.project_features_id_seq @@ -5998,7 +6003,9 @@ CREATE TABLE public.status_page_settings ( aws_region character varying(255) NOT NULL, aws_access_key character varying(255) NOT NULL, encrypted_aws_secret_key character varying(255) NOT NULL, - encrypted_aws_secret_key_iv character varying(255) NOT NULL + encrypted_aws_secret_key_iv character varying(255) NOT NULL, + status_page_url text, + CONSTRAINT check_75a79cd992 CHECK ((char_length(status_page_url) <= 1024)) ); CREATE SEQUENCE public.status_page_settings_project_id_seq @@ -6130,7 +6137,12 @@ CREATE TABLE public.terraform_states ( created_at timestamp with time zone NOT NULL, updated_at timestamp with time zone NOT NULL, file_store smallint, - file character varying(255) + file character varying(255), + lock_xid character varying(255), + locked_at timestamp with time zone, + locked_by_user_id bigint, + uuid character varying(32) NOT NULL, + name character varying(255) ); CREATE SEQUENCE public.terraform_states_id_seq @@ -7699,9 +7711,6 @@ ALTER TABLE ONLY public.ci_daily_report_results ALTER TABLE ONLY public.ci_group_variables ADD CONSTRAINT ci_group_variables_pkey PRIMARY KEY (id); -ALTER TABLE public.ci_job_artifacts - ADD CONSTRAINT ci_job_artifacts_file_store_not_null CHECK ((file_store IS NOT NULL)) NOT VALID; - ALTER TABLE ONLY public.ci_job_artifacts ADD CONSTRAINT ci_job_artifacts_pkey PRIMARY KEY (id); @@ -8059,9 +8068,6 @@ ALTER TABLE ONLY public.ldap_group_links ALTER TABLE ONLY public.lfs_file_locks ADD CONSTRAINT lfs_file_locks_pkey PRIMARY KEY (id); -ALTER TABLE public.lfs_objects - ADD CONSTRAINT lfs_objects_file_store_not_null CHECK ((file_store IS NOT NULL)) NOT VALID; - ALTER TABLE ONLY public.lfs_objects ADD CONSTRAINT lfs_objects_pkey PRIMARY KEY (id); @@ -8455,9 +8461,6 @@ ALTER TABLE ONLY public.u2f_registrations ALTER TABLE ONLY public.uploads ADD CONSTRAINT uploads_pkey PRIMARY KEY (id); -ALTER TABLE public.uploads - ADD CONSTRAINT uploads_store_not_null CHECK ((store IS NOT NULL)) NOT VALID; - ALTER TABLE ONLY public.user_agent_details ADD CONSTRAINT user_agent_details_pkey PRIMARY KEY (id); @@ -8575,6 +8578,8 @@ CREATE UNIQUE INDEX design_management_designs_versions_uniqueness ON public.desi CREATE INDEX design_user_mentions_on_design_id_and_note_id_index ON public.design_user_mentions USING btree (design_id, note_id); +CREATE INDEX dev_index_route_on_path_trigram ON public.routes USING gin (path public.gin_trgm_ops); + CREATE UNIQUE INDEX epic_user_mentions_on_epic_id_and_note_id_index ON public.epic_user_mentions USING btree (epic_id, note_id); CREATE UNIQUE INDEX epic_user_mentions_on_epic_id_index ON public.epic_user_mentions USING btree (epic_id) WHERE (note_id IS NULL); @@ -8587,6 +8592,8 @@ CREATE UNIQUE INDEX idx_environment_merge_requests_unique_index ON public.deploy CREATE INDEX idx_geo_con_rep_updated_events_on_container_repository_id ON public.geo_container_repository_updated_events USING btree (container_repository_id); +CREATE INDEX idx_issues_on_health_status_not_null ON public.issues USING btree (health_status) WHERE (health_status IS NOT NULL); + CREATE INDEX idx_issues_on_project_id_and_created_at_and_id_and_state_id ON public.issues USING btree (project_id, created_at, id, state_id); CREATE INDEX idx_issues_on_project_id_and_due_date_and_id_and_state_id ON public.issues USING btree (project_id, due_date, id, state_id) WHERE (due_date IS NOT NULL); @@ -9369,6 +9376,8 @@ CREATE INDEX index_import_failures_on_correlation_id_value ON public.import_fail CREATE INDEX index_import_failures_on_group_id_not_null ON public.import_failures USING btree (group_id) WHERE (group_id IS NOT NULL); +CREATE INDEX index_import_failures_on_project_id_and_correlation_id_value ON public.import_failures USING btree (project_id, correlation_id_value) WHERE (retry_count = 0); + CREATE INDEX index_import_failures_on_project_id_not_null ON public.import_failures USING btree (project_id) WHERE (project_id IS NOT NULL); CREATE UNIQUE INDEX index_index_statuses_on_project_id ON public.index_statuses USING btree (project_id); @@ -9671,6 +9680,8 @@ CREATE INDEX index_namespaces_on_path_trigram ON public.namespaces USING gin (pa CREATE INDEX index_namespaces_on_plan_id ON public.namespaces USING btree (plan_id); +CREATE UNIQUE INDEX index_namespaces_on_push_rule_id ON public.namespaces USING btree (push_rule_id); + CREATE INDEX index_namespaces_on_require_two_factor_authentication ON public.namespaces USING btree (require_two_factor_authentication); CREATE UNIQUE INDEX index_namespaces_on_runners_token ON public.namespaces USING btree (runners_token); @@ -9931,8 +9942,6 @@ CREATE INDEX index_projects_api_vis20_updated_at ON public.projects USING btree CREATE INDEX index_projects_on_created_at_and_id ON public.projects USING btree (created_at, id); -CREATE INDEX index_projects_on_creator_id_and_created_at ON public.projects USING btree (creator_id, created_at); - CREATE INDEX index_projects_on_creator_id_and_created_at_and_id ON public.projects USING btree (creator_id, created_at, id); CREATE INDEX index_projects_on_creator_id_and_id ON public.projects USING btree (creator_id, id); @@ -10123,6 +10132,8 @@ CREATE UNIQUE INDEX index_routes_on_path ON public.routes USING btree (path); CREATE INDEX index_routes_on_path_text_pattern_ops ON public.routes USING btree (path varchar_pattern_ops); +CREATE INDEX index_routes_on_path_trigram ON public.routes USING gin (path public.gin_trgm_ops); + CREATE UNIQUE INDEX index_routes_on_source_type_and_source_id ON public.routes USING btree (source_type, source_id); CREATE INDEX index_saml_providers_on_group_id ON public.saml_providers USING btree (group_id); @@ -10231,7 +10242,11 @@ CREATE INDEX index_term_agreements_on_term_id ON public.term_agreements USING bt CREATE INDEX index_term_agreements_on_user_id ON public.term_agreements USING btree (user_id); -CREATE INDEX index_terraform_states_on_project_id ON public.terraform_states USING btree (project_id); +CREATE INDEX index_terraform_states_on_locked_by_user_id ON public.terraform_states USING btree (locked_by_user_id); + +CREATE UNIQUE INDEX index_terraform_states_on_project_id_and_name ON public.terraform_states USING btree (project_id, name); + +CREATE UNIQUE INDEX index_terraform_states_on_uuid ON public.terraform_states USING btree (uuid); CREATE INDEX index_timelogs_on_issue_id ON public.timelogs USING btree (issue_id); @@ -10627,6 +10642,9 @@ ALTER TABLE ONLY public.merge_requests ALTER TABLE ONLY public.ci_group_variables ADD CONSTRAINT fk_33ae4d58d8 FOREIGN KEY (group_id) REFERENCES public.namespaces(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.namespaces + ADD CONSTRAINT fk_3448c97865 FOREIGN KEY (push_rule_id) REFERENCES public.push_rules(id) ON DELETE SET NULL; + ALTER TABLE ONLY public.epics ADD CONSTRAINT fk_3654b61b03 FOREIGN KEY (author_id) REFERENCES public.users(id) ON DELETE CASCADE; @@ -11047,9 +11065,21 @@ ALTER TABLE ONLY public.issues ALTER TABLE ONLY public.geo_event_log ADD CONSTRAINT fk_geo_event_log_on_geo_event_id FOREIGN KEY (geo_event_id) REFERENCES public.geo_events(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.path_locks + ADD CONSTRAINT fk_path_locks_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.personal_access_tokens ADD CONSTRAINT fk_personal_access_tokens_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.protected_branch_merge_access_levels + ADD CONSTRAINT fk_protected_branch_merge_access_levels_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + +ALTER TABLE ONLY public.protected_branch_push_access_levels + ADD CONSTRAINT fk_protected_branch_push_access_levels_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + +ALTER TABLE ONLY public.protected_tag_create_access_levels + ADD CONSTRAINT fk_protected_tag_create_access_levels_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.approval_merge_request_rules ADD CONSTRAINT fk_rails_004ce82224 FOREIGN KEY (merge_request_id) REFERENCES public.merge_requests(id) ON DELETE CASCADE; @@ -11194,9 +11224,6 @@ ALTER TABLE ONLY public.clusters_applications_runners ALTER TABLE ONLY public.service_desk_settings ADD CONSTRAINT fk_rails_223a296a85 FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; -ALTER TABLE ONLY public.protected_tag_create_access_levels - ADD CONSTRAINT fk_rails_2349b78b91 FOREIGN KEY (user_id) REFERENCES public.users(id); - ALTER TABLE ONLY public.group_custom_attributes ADD CONSTRAINT fk_rails_246e0db83a FOREIGN KEY (group_id) REFERENCES public.namespaces(id) ON DELETE CASCADE; @@ -11398,6 +11425,9 @@ ALTER TABLE ONLY public.geo_node_namespace_links ALTER TABLE ONLY public.clusters_applications_knative ADD CONSTRAINT fk_rails_54fc91e0a0 FOREIGN KEY (cluster_id) REFERENCES public.clusters(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.terraform_states + ADD CONSTRAINT fk_rails_558901b030 FOREIGN KEY (locked_by_user_id) REFERENCES public.users(id); + ALTER TABLE ONLY public.issue_user_mentions ADD CONSTRAINT fk_rails_57581fda73 FOREIGN KEY (issue_id) REFERENCES public.issues(id) ON DELETE CASCADE; @@ -11443,9 +11473,6 @@ ALTER TABLE ONLY public.resource_weight_events ALTER TABLE ONLY public.approval_project_rules ADD CONSTRAINT fk_rails_5fb4dd100b FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; -ALTER TABLE ONLY public.protected_branch_merge_access_levels - ADD CONSTRAINT fk_rails_5ffb4f3590 FOREIGN KEY (user_id) REFERENCES public.users(id); - ALTER TABLE ONLY public.user_highest_roles ADD CONSTRAINT fk_rails_60f6c325a6 FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; @@ -11554,9 +11581,6 @@ ALTER TABLE ONLY public.geo_repositories_changed_events ALTER TABLE ONLY public.resource_label_events ADD CONSTRAINT fk_rails_75efb0a653 FOREIGN KEY (epic_id) REFERENCES public.epics(id) ON DELETE CASCADE; -ALTER TABLE ONLY public.path_locks - ADD CONSTRAINT fk_rails_762cdcf942 FOREIGN KEY (user_id) REFERENCES public.users(id); - ALTER TABLE ONLY public.x509_certificates ADD CONSTRAINT fk_rails_76479fb5b4 FOREIGN KEY (x509_issuer_id) REFERENCES public.x509_issuers(id) ON DELETE CASCADE; @@ -11632,9 +11656,6 @@ ALTER TABLE ONLY public.vulnerability_feedback ALTER TABLE ONLY public.approval_merge_request_rules_approved_approvers ADD CONSTRAINT fk_rails_8dc94cff4d FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; -ALTER TABLE ONLY public.protected_branch_push_access_levels - ADD CONSTRAINT fk_rails_8dcb712d65 FOREIGN KEY (user_id) REFERENCES public.users(id); - ALTER TABLE ONLY public.design_user_mentions ADD CONSTRAINT fk_rails_8de8c6d632 FOREIGN KEY (note_id) REFERENCES public.notes(id) ON DELETE CASCADE; @@ -11845,9 +11866,6 @@ ALTER TABLE ONLY public.resource_weight_events ALTER TABLE ONLY public.design_management_designs ADD CONSTRAINT fk_rails_bfe283ec3c FOREIGN KEY (issue_id) REFERENCES public.issues(id) ON DELETE CASCADE; -ALTER TABLE ONLY public.u2f_registrations - ADD CONSTRAINT fk_rails_bfe6a84544 FOREIGN KEY (user_id) REFERENCES public.users(id); - ALTER TABLE ONLY public.serverless_domain_cluster ADD CONSTRAINT fk_rails_c09009dee1 FOREIGN KEY (pages_domain_id) REFERENCES public.pages_domains(id) ON DELETE CASCADE; @@ -12082,6 +12100,9 @@ ALTER TABLE ONLY public.timelogs ALTER TABLE ONLY public.timelogs ADD CONSTRAINT fk_timelogs_merge_requests_merge_request_id FOREIGN KEY (merge_request_id) REFERENCES public.merge_requests(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.u2f_registrations + ADD CONSTRAINT fk_u2f_registrations_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE; + COPY "schema_migrations" (version) FROM STDIN; 20171230123729 20180101160629 @@ -13160,15 +13181,37 @@ COPY "schema_migrations" (version) FROM STDIN; 20200406102111 20200406102120 20200406135648 -20200406165950 -20200406171857 -20200406172135 20200406192059 +20200406193427 20200407094005 20200407094923 +20200407120000 +20200407121321 +20200407171133 +20200407171417 20200408110856 +20200408133211 20200408153842 +20200408154331 +20200408154349 +20200408154411 +20200408154428 +20200408154455 +20200408154533 +20200408154604 +20200408154624 20200408175424 +20200408212219 +20200409085956 20200409211607 +20200410232012 +20200413072059 +20200414144547 +20200415160722 +20200415161021 +20200415161206 +20200415192656 +20200416120128 +20200416120354 \. |