From 859dc18e2bf81c93842ca3d71be37b35dc6cb524 Mon Sep 17 00:00:00 2001 From: sue445 Date: Sat, 23 Oct 2021 11:51:45 +0900 Subject: [PATCH 1/2] Upgrade rubocop to 1.22.2 --- rubocop-isucon.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-isucon.gemspec b/rubocop-isucon.gemspec index b50fdda8..50d33dc5 100644 --- a/rubocop-isucon.gemspec +++ b/rubocop-isucon.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "activerecord", ">= 6.1.0" spec.add_runtime_dependency "gda" - spec.add_runtime_dependency "rubocop", ">= 1.22.0" + spec.add_runtime_dependency "rubocop", ">= 1.22.2" spec.add_runtime_dependency "rubocop-performance" spec.add_development_dependency "benchmark-ips" From e3b6b3d895ff30d81b6e1895f959d30461b2959c Mon Sep 17 00:00:00 2001 From: sue445 Date: Sat, 23 Oct 2021 12:01:38 +0900 Subject: [PATCH 2/2] Fix CI --- lib/rubocop/isucon/sql_parser.rb | 2 +- spec/rubocop/isucon/database_connection_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rubocop/isucon/sql_parser.rb b/lib/rubocop/isucon/sql_parser.rb index 1ead7296..4e3a3a70 100644 --- a/lib/rubocop/isucon/sql_parser.rb +++ b/lib/rubocop/isucon/sql_parser.rb @@ -19,7 +19,7 @@ def self.parse_tables(sql) sql = sql.gsub(/ON\s+DUPLICATE\s+KEY\s+UPDATE/i, "") sql.scan(/(?:FROM|INTO|UPDATE|JOIN)\s+([^(]+?)[\s(]/i). - map { |matched| matched[0].strip.delete("`") }.reject(&:empty?).uniq + map { |matched| matched[0].strip.delete("`") }.reject(&:empty?).uniq # rubocop:disable Layout/DotPosition end end end diff --git a/spec/rubocop/isucon/database_connection_spec.rb b/spec/rubocop/isucon/database_connection_spec.rb index cb8914b7..ad60e5df 100644 --- a/spec/rubocop/isucon/database_connection_spec.rb +++ b/spec/rubocop/isucon/database_connection_spec.rb @@ -8,7 +8,7 @@ adapter: "sqlite3", database: ":memory:", timeout: 500, - }.transform_keys(&:to_s) + }.transform_keys(&:to_s) # rubocop:disable Layout/DotPosition end describe "#column_names" do