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: Improve stage_id in ci_builds foreign key migration

---
 ...0703102400_add_stage_id_foreign_key_to_builds.rb | 21 +++++++++++++++++++++
 .../20170621102400_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
-- 
cgit v1.2.1


From 6a61528512b35f246d0391d1f6d1c099692405fd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 4 Jul 2017 08:40:42 +0200
Subject: Bump database schema version

---
 db/schema.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 8c7440ee610..b022ade2e16 100644
--- a/db/schema.rb
+++ b/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: 20170622162730) do
+ActiveRecord::Schema.define(version: 20170703102400) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-- 
cgit v1.2.1


From 5af3eb5f9f4d467ad70a2c5107d7c837bff36afa Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 4 Jul 2017 12:40:45 +0200
Subject: Check foreign keys in migration in separate conditional

---
 .../20170703102400_add_stage_id_foreign_key_to_builds.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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
index a54d8e3c36d..68b947583d3 100644
--- a/db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb
+++ b/db/migrate/20170703102400_add_stage_id_foreign_key_to_builds.rb
@@ -8,14 +8,28 @@ class AddStageIdForeignKeyToBuilds < ActiveRecord::Migration
   def up
     unless index_exists?(:ci_builds, :stage_id)
       add_concurrent_index(:ci_builds, :stage_id)
+    end
+
+    unless foreign_key_exists?(: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)
+    if foreign_key_exists?(:ci_builds, :stage_id)
       remove_foreign_key(:ci_builds, column: :stage_id)
+    end
+
+    if index_exists?(:ci_builds, :stage_id)
       remove_concurrent_index(:ci_builds, :stage_id)
     end
   end
+
+  private
+
+  def foreign_key_exists?(table, column)
+    foreign_keys(:ci_builds).any? do |key|
+      key.options[:column] == column.to_s
+    end
+  end
 end
-- 
cgit v1.2.1