Update name of test

[rails.git] / db / migrate / 021_move_to_innodb.rb

diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb
index b58817ed9f4ecd389faded480adf3f54d86a6654..edfecdfd9a84b19ec742cf62c8c36122a1dd6a50 100644 (file)
--- 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 = " +
@@ -36,6 +36,6 @@ class MoveToInnodb < ActiveRecord::Migration
   end
 
   def self.down
-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration
   end
 end