diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:08:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:08:16 +0000 |
commit | e80e0dd64fbb04f60394cb1bb08e17dbcb22b8ce (patch) | |
tree | 9e538341b9b77e96737964813e10235dbecf47ff /db/migrate | |
parent | ef31adeb0fb9a02b2c6a4529ec4e38d7082a4b2b (diff) | |
download | gitlab-ce-e80e0dd64fbb04f60394cb1bb08e17dbcb22b8ce.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20200323071918_add_bio_to_user_details.rb | 17 | ||||
-rw-r--r-- | db/migrate/20200323074147_add_temp_index_on_users_bio.rb | 18 |
2 files changed, 35 insertions, 0 deletions
diff --git a/db/migrate/20200323071918_add_bio_to_user_details.rb b/db/migrate/20200323071918_add_bio_to_user_details.rb new file mode 100644 index 00000000000..90e4b964695 --- /dev/null +++ b/db/migrate/20200323071918_add_bio_to_user_details.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddBioToUserDetails < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:user_details, :bio, :string, default: '', allow_null: false, limit: 255, update_column_in_batches_args: { batch_column_name: :user_id }) + end + + def down + remove_column(:user_details, :bio) + end +end diff --git a/db/migrate/20200323074147_add_temp_index_on_users_bio.rb b/db/migrate/20200323074147_add_temp_index_on_users_bio.rb new file mode 100644 index 00000000000..4b26bb971f5 --- /dev/null +++ b/db/migrate/20200323074147_add_temp_index_on_users_bio.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class AddTempIndexOnUsersBio < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + INDEX_NAME = 'tmp_idx_on_user_id_where_bio_is_filled' + + disable_ddl_transaction! + + def up + add_concurrent_index :users, :id, where: "(COALESCE(bio, '') IS DISTINCT FROM '')", name: INDEX_NAME + end + + def down + remove_concurrent_index_by_name :users, INDEX_NAME + end +end |