Make wrong migrations idempotent

3 files changed, 11 insertions, 3 deletions

diff --git a/db/migrate/20170707183807_add_group_id_to_milestones.rb b/db/migrate/20170707183807_add_group_id_to_milestones.rb
index e46fc4f80f0..675ffd4a1c9 100644
--- a/db/migrate/20170707183807_add_group_id_to_milestones.rb
+++ b/db/migrate/20170707183807_add_group_id_to_milestones.rb
@@ -2,6 +2,8 @@ class AddGroupIdToMilestones < ActiveRecord::Migration
   DOWNTIME = false
 
   def up
+    return if column_exists? :milestones, :group_id
+
     change_column_null :milestones, :project_id, true
 
     add_column :milestones, :group_id, :integer
diff --git a/db/migrate/20170707184243_add_group_milestone_id_indexes.rb b/db/migrate/20170707184243_add_group_milestone_id_indexes.rb
index d48b1884179..aa48fe90cad 100644
--- a/db/migrate/20170707184243_add_group_milestone_id_indexes.rb
+++ b/db/migrate/20170707184243_add_group_milestone_id_indexes.rb
@@ -6,6 +6,8 @@ class AddGroupMilestoneIdIndexes < ActiveRecord::Migration
   DOWNTIME = false
 
   def up
+    return if index_exists?(:milestones, :group_id)
+
     add_concurrent_foreign_key :milestones, :namespaces, column: :group_id, on_delete: :cascade
 
     add_concurrent_index :milestones, :group_id
diff --git a/db/migrate/20170707184244_remove_wrong_versions_from_schema_versions.rb b/db/migrate/20170707184244_remove_wrong_versions_from_schema_versions.rb
index f82a5dffa9e..38536a8b06a 100644
--- a/db/migrate/20170707184244_remove_wrong_versions_from_schema_versions.rb
+++ b/db/migrate/20170707184244_remove_wrong_versions_from_schema_versions.rb
@@ -1,6 +1,10 @@
 class RemoveWrongVersionsFromSchemaVersions < ActiveRecord::Migration
-  def change
-    execute "UPDATE schema_migrations SET version = '20170707183807' WHERE version = '20170723183807'"
-    execute "UPDATE schema_migrations SET version = '20170707184243' WHERE version = '20170724184243'"
+  DOWNTIME = false
+
+  def up
+    execute("DELETE FROM schema_migrations WHERE version IN ('20170723183807', '20170724184243')")
+  end
+
+  def down
   end
 end