Merge branch 'zj-disable-timeout-migration' into 'master'

Disable timeout while removing services Closes #25976 See merge request !8322

Merge branch 'zj-disable-timeout-migration' into 'master'
33e9c9ca · Yorick Peterse · 7daa5416 · 269bc745 · 33e9c9ca
Commit 33e9c9ca authored Dec 27, 2016 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

20161221140236_remove_unneeded_services.rb db/post_migrate/20161221140236_remove_unneeded_services.rb +2 -0

No files found.
--- a/db/post_migrate/20161221140236_remove_unneeded_services.rb
+++ b/db/post_migrate/20161221140236_remove_unneeded_services.rb
@@ -4,6 +4,8 @@ class RemoveUnneededServices < ActiveRecord::Migration
  DOWNTIME = false

  def up
+    disable_statement_timeout
+
    execute("DELETE FROM services WHERE active = false AND properties = '{}';")
  end