2 files changed, 50 insertions, 2 deletions
diff --git a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
index 3a4d6c4916b..9d9f36550e7 100644
--- a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
+++ b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
@@ -54,14 +54,14 @@ class UpdateRetriedForCiBuild < ActiveRecord::Migration
 
   def with_temporary_partial_index
     if Gitlab::Database.postgresql?
-      unless index_exists?(:ci_builds, name: :index_for_ci_builds_retried_migration)
+      unless index_exists?(:ci_builds, :id, name: :index_for_ci_builds_retried_migration)
         execute 'CREATE INDEX CONCURRENTLY index_for_ci_builds_retried_migration ON ci_builds (id) WHERE retried IS NULL;'
       end
     end
 
     yield
 
-    if Gitlab::Database.postgresql? && index_exists?(:ci_builds, name: :index_for_ci_builds_retried_migration)
+    if Gitlab::Database.postgresql? && index_exists?(:ci_builds, :id, name: :index_for_ci_builds_retried_migration)
       execute 'DROP INDEX CONCURRENTLY index_for_ci_builds_retried_migration'
     end
   end
diff --git a/db/post_migrate/20170830150306_drop_events_for_migration_table.rb b/db/post_migrate/20170830150306_drop_events_for_migration_table.rb
new file mode 100644
index 00000000000..763ee9a810d
--- /dev/null
+++ b/db/post_migrate/20170830150306_drop_events_for_migration_table.rb
@@ -0,0 +1,48 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class DropEventsForMigrationTable < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  class Event < ActiveRecord::Base
+    include EachBatch
+  end
+
+  def up
+    transaction do
+      drop_table :events_for_migration
+    end
+  end
+
+  # rubocop: disable Migration/Datetime
+  def down
+    create_table :events_for_migration do |t|
+      t.string :target_type, index: true
+      t.integer :target_id, index: true
+      t.string :title
+      t.text :data
+      t.integer :project_id
+      t.datetime :created_at, index: true
+      t.datetime :updated_at
+      t.integer :action, index: true
+      t.integer :author_id, index: true
+
+      t.index [:project_id, :id]
+    end
+
+    Event.all.each_batch do |relation|
+      start_id, stop_id = relation.pluck('MIN(id), MAX(id)').first
+
+      execute <<-EOF.strip_heredoc
+      INSERT INTO events_for_migration (target_type, target_id, project_id, created_at, updated_at, action, author_id)
+      SELECT target_type, target_id, project_id, created_at, updated_at, action, author_id
+      FROM events
+      WHERE id BETWEEN #{start_id} AND #{stop_id}
+      EOF
+    end
+  end
+end