Merge branch 'master' into moderation

[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 72a4607d9de028bff97bb6283c897da9ada84908..6ef3587d10055388dc1844bade7c40c5f688a2ce 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,25 +1,25 @@
-require 'migrate'
+require "migrate"

 
 class MoveToInnodb < ActiveRecord::Migration
 
 class MoveToInnodb < ActiveRecord::Migration

-  @@conv_tables = %w(nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags)
+  @conv_tables = %w[nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags]

 
 

-  @@ver_tbl = %w(nodes ways relations)
+  @ver_tbl = %w[nodes ways relations]

 
   def self.up
     remove_index :current_way_tags, :name => :current_way_tags_v_idx
     remove_index :current_relation_tags, :name => :current_relation_tags_v_idx
 
 
   def self.up
     remove_index :current_way_tags, :name => :current_way_tags_v_idx
     remove_index :current_relation_tags, :name => :current_relation_tags_v_idx
 

-    @@ver_tbl.each do |tbl|
+    @ver_tbl.each do |tbl|

       change_column tbl, "version", :bigint, :null => false
     end
 
       change_column tbl, "version", :bigint, :null => false
     end
 

-    @@ver_tbl.each do |tbl|
+    @ver_tbl.each do |tbl|

       add_column "current_#{tbl}", "version", :bigint, :null => false
       # 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
       add_column "current_#{tbl}", "version", :bigint, :null => false
       # 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 = " +
         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
   end
 
   def self.down

-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration

   end
 end
   end
 end