From 0ba5e978ea32893c8c6a92642707eaabbe4dbf36 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 17 May 2019 11:41:24 +0000 Subject: [PATCH] Merge branch 'dz-improve-ci-id-migration' into 'master' Add extra checks for ci_id migration See merge request gitlab-org/gitlab-ce!28404 (cherry picked from commit 30a60ee4a0373b184bc1a825bf332ee357d5f899) 5786de36 Add extra checks for ci_id migration --- db/post_migrate/20190424134256_drop_projects_ci_id.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/db/post_migrate/20190424134256_drop_projects_ci_id.rb b/db/post_migrate/20190424134256_drop_projects_ci_id.rb index 79fa9704f1f..44e8f316393 100644 --- a/db/post_migrate/20190424134256_drop_projects_ci_id.rb +++ b/db/post_migrate/20190424134256_drop_projects_ci_id.rb @@ -22,7 +22,12 @@ class DropProjectsCiId < ActiveRecord::Migration[5.1] end def down - add_column :projects, :ci_id, :integer - add_concurrent_index :projects, :ci_id + unless column_exists?(:projects, :ci_id) + add_column :projects, :ci_id, :integer + end + + unless index_exists?(:projects, :ci_id) + add_concurrent_index :projects, :ci_id + end end end -- GitLab