From 3bad69cc78c29b2d1ec06deb540ffb77872de265 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 3 Jul 2017 20:24:32 +0200
Subject: [PATCH] Improve stage_id in ci_builds foreign key migration

---
 ...2400_add_stage_id_foreign_key_to_builds.rb | 21 +++++++++++++++++++
 ...0621102400_add_stage_id_index_to_builds.rb | 14 +++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb

diff --git a/db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb b/db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb
new file mode 100644
index 00000000000..a54d8e3c36d
--- /dev/null
+++ b/db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb
@@ -0,0 +1,21 @@
+class AddStageIdForeignKeyToBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless index_exists?(:ci_builds, :stage_id)
+      add_concurrent_index(:ci_builds, :stage_id)
+      add_concurrent_foreign_key(:ci_builds, :ci_stages, column: :stage_id, on_delete: :cascade)
+    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
diff --git a/db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb b/db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb
index 7d6609b18bf..ac61b5c84a8 100644
--- a/db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb
+++ b/db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb
@@ -3,19 +3,15 @@ class AddStageIdIndexToBuilds < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  disable_ddl_transaction!
+  ##
+  # Improved in 20170703102400_add_stage_id_foreign_key_to_builds.rb
+  #
 
   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
+    # noop
   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
+    # noop
   end
 end