1 files changed, 12 insertions, 12 deletions
diff --git a/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb b/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb
index d06454fd09c..680855af945 100644
--- a/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb
+++ b/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb
@@ -17,48 +17,48 @@ class PopulateCanPushFromDeployKeysProjects < ActiveRecord::Migration
   end
 
   def up
-    # DeploysKeyProject.each_batch(of: 10_000) do |batch|
-    #   start_id, end_id = batch.pluck('MIN(id), MAX(id)').first
+    DeploysKeyProject.each_batch(of: 10_000) do |batch|
+      start_id, end_id = batch.pluck('MIN(id), MAX(id)').first
 
       if Gitlab::Database.mysql?
         execute <<-EOF.strip_heredoc
           UPDATE deploy_keys_projects, #{DATABASE_NAME}.keys
           SET deploy_keys_projects.can_push = #{DATABASE_NAME}.keys.can_push
           WHERE deploy_keys_projects.deploy_key_id = #{DATABASE_NAME}.keys.id
+          AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
         EOF
-        # AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
       else
         execute <<-EOF.strip_heredoc
           UPDATE deploy_keys_projects
           SET can_push = keys.can_push
           FROM keys
           WHERE deploy_key_id = keys.id
+          AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
         EOF
-        # AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
       end
-    # end
+    end
   end
 
   def down
-    # DeploysKeyProject.each_batch(of: 10_000) do |batch|
-    #   start_id, end_id = batch.pluck('MIN(id), MAX(id)').first
+    DeploysKeyProject.each_batch(of: 10_000) do |batch|
+      start_id, end_id = batch.pluck('MIN(id), MAX(id)').first
 
       if Gitlab::Database.mysql?
-        execute <<-EOF
+        execute <<-EOF.strip_heredoc
           UPDATE deploy_keys_projects, #{DATABASE_NAME}.keys
           SET #{DATABASE_NAME}.keys.can_push = deploy_keys_projects.can_push
           WHERE deploy_keys_projects.deploy_key_id = #{DATABASE_NAME}.keys.id
+          AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
         EOF
-        # AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
       else
-        execute <<-EOF
+        execute <<-EOF.strip_heredoc
           UPDATE keys
           SET can_push = deploy_keys_projects.can_push
           FROM deploy_keys_projects
           WHERE deploy_keys_projects.deploy_key_id = keys.id
+          AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
         EOF
-        # AND deploy_keys_projects.id BETWEEN #{start_id} AND #{end_id}
       end
-    # end
+    end
   end
 end