From b1e44c1eeaac01a0505c260ea7cb10ade5f336ba Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 2 Sep 2020 18:27:11 +0100 Subject: [PATCH] Fix rubocop Style/CombinableLoops warnings --- .rubocop_todo.yml | 5 ----- db/migrate/021_move_to_innodb.rb | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 87bf43bc3..2d638e1e1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -188,11 +188,6 @@ Rails/OutputSafety: Rails/TimeZone: Enabled: false -# Offense count: 1 -Style/CombinableLoops: - Exclude: - - 'db/migrate/021_move_to_innodb.rb' - # Offense count: 572 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb index 47ebecc83..81663eb1b 100644 --- a/db/migrate/021_move_to_innodb.rb +++ b/db/migrate/021_move_to_innodb.rb @@ -11,11 +11,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) -- 2.39.5