Merge branch 'fix/gb/improve-build-stage-reference-migration' into 'master'

db/migrate/20170526185602_add_stage_id_to_ci_builds.rb

@@ -3,19 +3,11 @@ class AddStageIdToCiBuilds < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  disable_ddl_transaction!
-
   def up
     add_column :ci_builds, :stage_id, :integer
-
-    add_concurrent_foreign_key :ci_builds, :ci_stages, column: :stage_id, on_delete: :cascade
-    add_concurrent_index :ci_builds, :stage_id
   end
 
   def down
-    remove_foreign_key :ci_builds, column: :stage_id
-    remove_concurrent_index :ci_builds, :stage_id
-
     remove_column :ci_builds, :stage_id, :integer
   end
 end

db/post_migrate/20170526185901_remove_stage_id_index_from_builds.rb

+class RemoveStageIdIndexFromBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    if index_exists?(:ci_builds, :stage_id)
+      remove_foreign_key(:ci_builds, column: :stage_id)
+      remove_concurrent_index(:ci_builds, :stage_id)
+    end
+  end
+
+  def down
+    # noop
+  end
+end

db/post_migrate/20170526185921_migrate_build_stage_reference.rb

@@ -3,23 +3,17 @@ class MigrateBuildStageReference < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  def up
-    disable_statement_timeout
-
-    stage_id = Arel.sql <<-SQL.strip_heredoc
-      (SELECT id FROM ci_stages
-         WHERE ci_stages.pipeline_id = ci_builds.commit_id
-           AND ci_stages.name = ci_builds.stage)
-    SQL
+  ##
+  # This is an empty migration, content has been moved to a new one:
+  # post migrate 20170526190000 MigrateBuildStageReferenceAgain
+  #
+  # See gitlab-org/gitlab-ce!12337 for more details.
 
-    update_column_in_batches(:ci_builds, :stage_id, stage_id) do |table, query|
-      query.where(table[:stage_id].eq(nil))
-    end
+  def up
+    # noop
   end
 
   def down
-    disable_statement_timeout
-
-    update_column_in_batches(:ci_builds, :stage_id, nil)
+    # noop
   end
 end

db/post_migrate/20170526190000_migrate_build_stage_reference_again.rb

+class MigrateBuildStageReferenceAgain < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    disable_statement_timeout
+
+    stage_id = Arel.sql <<-SQL.strip_heredoc
+      (SELECT id FROM ci_stages
+         WHERE ci_stages.pipeline_id = ci_builds.commit_id
+           AND ci_stages.name = ci_builds.stage)
+    SQL
+
+    update_column_in_batches(:ci_builds, :stage_id, stage_id) do |table, query|
+      query.where(table[:stage_id].eq(nil))
+    end
+  end
+
+  def down
+    disable_statement_timeout
+
+    update_column_in_batches(:ci_builds, :stage_id, nil)
+  end
+end

db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb

+class AddStageIdIndexToBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless index_exists?(:ci_builds, :stage_id)
+      add_concurrent_foreign_key(:ci_builds, :ci_stages, column: :stage_id, on_delete: :cascade)
+      add_concurrent_index(:ci_builds, :stage_id)
+    end
+  end
+
+  def down
+    if index_exists?(:ci_builds, :stage_id)
+      remove_foreign_key(:ci_builds, column: :stage_id)
+      remove_concurrent_index(:ci_builds, :stage_id)
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170619144837) do
+ActiveRecord::Schema.define(version: 20170621102400) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/migrations/migrate_build_stage_reference_spec.rb → spec/migrations/migrate_build_stage_reference_again_spec.rb

 require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20170526185921_migrate_build_stage_reference.rb')
+require Rails.root.join('db', 'post_migrate', '20170526190000_migrate_build_stage_reference_again.rb')
 
-describe MigrateBuildStageReference, :migration do
+describe MigrateBuildStageReferenceAgain, :migration do
   ##
   # Create test data - pipeline and CI/CD jobs.
   #