diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 12:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 12:06:14 +0000 |
commit | e464f195ff5debc3e9aad0f8c4537404b92019c6 (patch) | |
tree | 9efe381ffb9d8c9bceb3cced1e27b6b59dc6298b /db | |
parent | 5ff1b520badaa2da217416964709f49f3ede350a (diff) | |
download | gitlab-ce-e464f195ff5debc3e9aad0f8c4537404b92019c6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20190930063627_add_management_project_id_to_clusters.rb | 9 | ||||
-rw-r--r-- | db/migrate/20191001040549_add_management_project_id_index_fk_to_clusters.rb | 19 | ||||
-rw-r--r-- | db/schema.rb | 3 |
3 files changed, 31 insertions, 0 deletions
diff --git a/db/migrate/20190930063627_add_management_project_id_to_clusters.rb b/db/migrate/20190930063627_add_management_project_id_to_clusters.rb new file mode 100644 index 00000000000..46c3fef8e76 --- /dev/null +++ b/db/migrate/20190930063627_add_management_project_id_to_clusters.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddManagementProjectIdToClusters < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :clusters, :management_project_id, :integer + end +end diff --git a/db/migrate/20191001040549_add_management_project_id_index_fk_to_clusters.rb b/db/migrate/20191001040549_add_management_project_id_index_fk_to_clusters.rb new file mode 100644 index 00000000000..97253dd1f2d --- /dev/null +++ b/db/migrate/20191001040549_add_management_project_id_index_fk_to_clusters.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddManagementProjectIdIndexFkToClusters < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_foreign_key :clusters, :projects, column: :management_project_id, on_delete: :nullify + add_concurrent_index :clusters, :management_project_id, where: 'management_project_id IS NOT NULL' + end + + def down + remove_concurrent_index :clusters, :management_project_id + remove_foreign_key_if_exists :clusters, column: :management_project_id + end +end diff --git a/db/schema.rb b/db/schema.rb index d1bd30a131e..1b1a6773c14 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -991,7 +991,9 @@ ActiveRecord::Schema.define(version: 2019_10_04_134055) do t.string "domain" t.boolean "managed", default: true, null: false t.boolean "namespace_per_environment", default: true, null: false + t.integer "management_project_id" t.index ["enabled"], name: "index_clusters_on_enabled" + t.index ["management_project_id"], name: "index_clusters_on_management_project_id", where: "(management_project_id IS NOT NULL)" t.index ["user_id"], name: "index_clusters_on_user_id" end @@ -3983,6 +3985,7 @@ ActiveRecord::Schema.define(version: 2019_10_04_134055) do add_foreign_key "cluster_projects", "clusters", on_delete: :cascade add_foreign_key "cluster_projects", "projects", on_delete: :cascade add_foreign_key "cluster_providers_gcp", "clusters", on_delete: :cascade + add_foreign_key "clusters", "projects", column: "management_project_id", name: "fk_f05c5e5a42", on_delete: :nullify add_foreign_key "clusters", "users", on_delete: :nullify add_foreign_key "clusters_applications_cert_managers", "clusters", on_delete: :cascade add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade |