Update paperclip

[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..3232e27411fe4181c198d425e743042c86bb76b1 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,9 +1,9 @@
 require "migrate"
 
 require "migrate"
 

-class MoveToInnodb < ActiveRecord::Migration
-  @conv_tables = %w(nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags)
+class MoveToInnodb < ActiveRecord::Migration[5.0]
+  @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
 
   def self.up
     remove_index :current_way_tags, :name => :current_way_tags_v_idx


@@ -18,10 +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
       # 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=(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)", { :version => -1 }, { :limit => 10000 })
-      end
+      tbl.classify.constantize.update_all(:version => -1)
+      tbl.classify.constantize.update_all("version=(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)", { :version => -1 }, { :limit => 10000 }) while tbl.classify.constantize.where(:version => -1).count > 0

       # execute "UPDATE current_#{tbl} SET version = " +
       #  "(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)"
       # The above update causes a MySQL error:
       # execute "UPDATE current_#{tbl} SET version = " +
       #  "(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)"
       # The above update causes a MySQL error:


@@ -36,6 +34,6 @@ class MoveToInnodb < ActiveRecord::Migration
   end
 
   def self.down
   end
 
   def self.down

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

   end
 end
   end
 end