Fix rubocop Style/CombinableLoops warnings

[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 d1c20bcdbc2764c17d625f33cb980408a22f0359..81663eb1b24d6a1e47f680ca3279ea826f79e6d6 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
-class MoveToInnodb < ActiveRecord::Migration[5.0]
+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]
 
   @ver_tbl = %w[nodes ways relations]
@@ -11,11 +11,8 @@ class MoveToInnodb < ActiveRecord::Migration[5.0]
 
     @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)