diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-09-07 18:15:09 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-09-07 18:15:09 +0300 |
commit | e814e18209deb75c97ab247c702cbeb173e460b2 (patch) | |
tree | 972a41dc1bc46c4e799508a0e2bc74db0bc8971f /db/post_migrate | |
parent | 4bb1a3c159860083860a41c738522d55a8a89fe4 (diff) | |
parent | d931cac7a3df2c890f3bd7a98aaa59947f460e42 (diff) |
Merge branch 'dz-rebuild-schema' into 'master'
Update schema.rb from db:migrate and fix invalid index check
See merge request !14107
Diffstat (limited to 'db/post_migrate')
-rw-r--r-- | db/post_migrate/20170503004427_update_retried_for_ci_build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb index 3a4d6c4916b..9d9f36550e7 100644 --- a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb +++ b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb @@ -54,14 +54,14 @@ class UpdateRetriedForCiBuild < ActiveRecord::Migration def with_temporary_partial_index if Gitlab::Database.postgresql? - unless index_exists?(:ci_builds, name: :index_for_ci_builds_retried_migration) + unless index_exists?(:ci_builds, :id, name: :index_for_ci_builds_retried_migration) execute 'CREATE INDEX CONCURRENTLY index_for_ci_builds_retried_migration ON ci_builds (id) WHERE retried IS NULL;' end end yield - if Gitlab::Database.postgresql? && index_exists?(:ci_builds, name: :index_for_ci_builds_retried_migration) + if Gitlab::Database.postgresql? && index_exists?(:ci_builds, :id, name: :index_for_ci_builds_retried_migration) execute 'DROP INDEX CONCURRENTLY index_for_ci_builds_retried_migration' end end |