From 600743f1706a70822456d9609f2056df9948c4ad Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 13 Jul 2016 09:38:32 +0100 Subject: [PATCH] Modernise migrations --- db/migrate/021_move_to_innodb.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb index ce8d33de4..edfecdfd9 100644 --- a/db/migrate/021_move_to_innodb.rb +++ b/db/migrate/021_move_to_innodb.rb @@ -18,8 +18,8 @@ class MoveToInnodb < ActiveRecord::Migration # As the initial version of all nodes, ways and relations is 0, we set the # current version to something less so that we can update the version in # batches of 10000 - tbl.classify.constantize.update_all("version=-1") - while tbl.classify.constantize.count(:conditions => { :version => -1 }) > 0 + tbl.classify.constantize.update_all(:version => -1) + while tbl.classify.constantize.where(:version => -1).count > 0 tbl.classify.constantize.update_all("version=(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)", { :version => -1 }, { :limit => 10000 }) end # execute "UPDATE current_#{tbl} SET version = " + -- 2.43.2