summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-03-09 12:50:57 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-03-09 12:19:54 -0600
commit08fbbaa832165a27eef70bbb66853fdc57b498ed (patch)
tree2c8a0ed45731367ec5b3fb768f320a0972759221
parentf1b8563aea5d38eef416f3336d4c79d0ddd8a5a9 (diff)
downloadgitlab-ce-08fbbaa832165a27eef70bbb66853fdc57b498ed.tar.gz
Merge branch 'sh-make-add-index-idempotent' into 'master'
Fix index name to Rails default to ensure idempotency See merge request gitlab-org/gitlab-ce!17654
-rw-r--r--db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb b/db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb
index 0cf665ac935..b616cc2fd30 100644
--- a/db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb
+++ b/db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb
@@ -3,20 +3,21 @@ class AddSectionNameIdIndexOnCiBuildTraceSections < ActiveRecord::Migration
# Set this constant to true if this migration requires downtime.
DOWNTIME = false
+ INDEX_NAME = 'index_ci_build_trace_sections_on_section_name_id'
disable_ddl_transaction!
def up
# MySQL may already have this as a foreign key
- unless index_exists?(:ci_build_trace_sections, :section_name_id)
- add_concurrent_index :ci_build_trace_sections, :section_name_id
+ unless index_exists?(:ci_build_trace_sections, :section_name_id, name: INDEX_NAME)
+ add_concurrent_index :ci_build_trace_sections, :section_name_id, name: INDEX_NAME
end
end
def down
# We cannot remove index for MySQL because it's needed for foreign key
if Gitlab::Database.postgresql?
- remove_concurrent_index :ci_build_trace_sections, :section_name_id
+ remove_concurrent_index :ci_build_trace_sections, :section_name_id, name: INDEX_NAME
end
end
end