From 89f0d0d78577f0c11cbfa2d84103ca130d60f81d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 5 May 2017 15:19:32 +0200
Subject: Update migrations

---
 .../20170416103719_add_retried_to_ci_build.rb      | 15 -----------
 .../20170503004426_add_retried_to_ci_build.rb      | 15 +++++++++++
 .../20170416103934_upate_retried_for_ci_build.rb   | 29 ----------------------
 .../20170503004427_upate_retried_for_ci_build.rb   | 29 ++++++++++++++++++++++
 db/schema.rb                                       |  4 +--
 5 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 db/migrate/20170416103719_add_retried_to_ci_build.rb
 create mode 100644 db/migrate/20170503004426_add_retried_to_ci_build.rb
 delete mode 100644 db/post_migrate/20170416103934_upate_retried_for_ci_build.rb
 create mode 100644 db/post_migrate/20170503004427_upate_retried_for_ci_build.rb

diff --git a/db/migrate/20170416103719_add_retried_to_ci_build.rb b/db/migrate/20170416103719_add_retried_to_ci_build.rb
deleted file mode 100644
index 9f509f97f14..00000000000
--- a/db/migrate/20170416103719_add_retried_to_ci_build.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddRetriedToCiBuild < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  def up
-    add_column_with_default(:ci_builds, :retried, :boolean, default: false)
-  end
-
-  def down
-    remove_column(:ci_builds, :retried)
-  end
-end
diff --git a/db/migrate/20170503004426_add_retried_to_ci_build.rb b/db/migrate/20170503004426_add_retried_to_ci_build.rb
new file mode 100644
index 00000000000..9f509f97f14
--- /dev/null
+++ b/db/migrate/20170503004426_add_retried_to_ci_build.rb
@@ -0,0 +1,15 @@
+class AddRetriedToCiBuild < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:ci_builds, :retried, :boolean, default: false)
+  end
+
+  def down
+    remove_column(:ci_builds, :retried)
+  end
+end
diff --git a/db/post_migrate/20170416103934_upate_retried_for_ci_build.rb b/db/post_migrate/20170416103934_upate_retried_for_ci_build.rb
deleted file mode 100644
index e12180930a7..00000000000
--- a/db/post_migrate/20170416103934_upate_retried_for_ci_build.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class UpateRetriedForCiBuild < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  
-  disable_ddl_transaction!
-
-  def up
-    disable_statement_timeout
-
-    latest_id = <<-SQL.strip_heredoc
-      SELECT MAX(ci_builds2.id)
-        FROM ci_builds ci_builds2
-        WHERE ci_builds.commit_id=ci_builds2.commit_id
-          AND ci_builds.name=ci_builds2.name
-    SQL
-    
-    # This is slow update as it does single-row query
-    # This is designed to be run as idle, or a post deployment migration
-    is_retried = Arel.sql("((#{latest_id}) != ci_builds.id)")
-
-    update_column_in_batches(:ci_builds, :retried, is_retried) do |table, query|
-      query.where(table[:retried].eq(false))
-    end
-  end
-
-  def down
-  end
-end
diff --git a/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb b/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
new file mode 100644
index 00000000000..e12180930a7
--- /dev/null
+++ b/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
@@ -0,0 +1,29 @@
+class UpateRetriedForCiBuild < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  
+  disable_ddl_transaction!
+
+  def up
+    disable_statement_timeout
+
+    latest_id = <<-SQL.strip_heredoc
+      SELECT MAX(ci_builds2.id)
+        FROM ci_builds ci_builds2
+        WHERE ci_builds.commit_id=ci_builds2.commit_id
+          AND ci_builds.name=ci_builds2.name
+    SQL
+    
+    # This is slow update as it does single-row query
+    # This is designed to be run as idle, or a post deployment migration
+    is_retried = Arel.sql("((#{latest_id}) != ci_builds.id)")
+
+    update_column_in_batches(:ci_builds, :retried, is_retried) do |table, query|
+      query.where(table[:retried].eq(false))
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8565363fa67..72503e10364 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: 20170504203205) do
+ActiveRecord::Schema.define(version: 20170503004427) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -230,7 +230,7 @@ ActiveRecord::Schema.define(version: 20170504203205) do
     t.integer "lock_version"
     t.string "coverage_regex"
     t.integer "auto_canceled_by_id"
-    t.boolean "retried", default: true, null: false
+    t.boolean "retried", default: false, null: false
   end
 
   add_index "ci_builds", ["commit_id", "stage_idx", "created_at"], name: "index_ci_builds_on_commit_id_and_stage_idx_and_created_at", using: :btree
-- 
cgit v1.2.1