Merge remote-tracking branch 'upstream/pull/5374'

[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 47ebecc835aa16d6ef0ed088d075dffbe0584fed..4dac8410c056e4c086f754d9caa12326686d5c08 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,5 +1,3 @@
-require "migrate"
-
 class MoveToInnodb < ActiveRecord::Migration[4.2]
   @conv_tables = %w[nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags]
 
@@ -11,11 +9,8 @@ class MoveToInnodb < ActiveRecord::Migration[4.2]
 
     @ver_tbl.each do |tbl|
       change_column tbl, "version", :bigint, :null => false
-    end
-
-    @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
+      # As the initial version of all nodes, ways and relations is 0, we set tehe
       # current version to something less so that we can update the version in
       # batches of 10000
       tbl.classify.constantize.update_all(:version => -1)