Modernise migrations

tomhughes · Jul 13, 2016 · 600743f · 600743f
1 parent 5fd4fd1
commit 600743f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb
@@ -18,8 +18,8 @@ def self.up
       # 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 = " +