From b4856368a6fc4e815a7166c367be66aee6f430e9 Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 14:55:22 +0100 Subject: [PATCH 1/8] Rubocop: Enable Naming/VariableNumber cop --- test/cases/column_test_sqlserver.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cases/column_test_sqlserver.rb b/test/cases/column_test_sqlserver.rb index c1d58a66c..01339faff 100644 --- a/test/cases/column_test_sqlserver.rb +++ b/test/cases/column_test_sqlserver.rb @@ -759,12 +759,12 @@ def assert_obj_set_and_save(attribute, value) _(type.precision).must_be_nil _(type.scale).must_be_nil # Basic set and save. - binary_data_20 = binary_data.to(20) - _(binary_data_20.encoding).must_equal Encoding::BINARY - obj.varbinary_49 = binary_data_20 - _(obj.varbinary_49).must_equal binary_data_20 + binary_data20 = binary_data.to(20) + _(binary_data20.encoding).must_equal Encoding::BINARY + obj.varbinary_49 = binary_data20 + _(obj.varbinary_49).must_equal binary_data20 obj.save! - _(obj.reload.varbinary_49).must_equal binary_data_20 + _(obj.reload.varbinary_49).must_equal binary_data20 end it "varbinary(max)" do From 16c4c3f7c6dba0331e18f6a650e2a9786702abc5 Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 14:58:43 +0100 Subject: [PATCH 2/8] Rubocop: Enable Naming/RescuedExceptionsVariableName cop --- lib/active_record/tasks/sqlserver_database_tasks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_record/tasks/sqlserver_database_tasks.rb b/lib/active_record/tasks/sqlserver_database_tasks.rb index 6b2df7e7c..cb5ee2dee 100644 --- a/lib/active_record/tasks/sqlserver_database_tasks.rb +++ b/lib/active_record/tasks/sqlserver_database_tasks.rb @@ -21,8 +21,8 @@ def create(master_established = false) establish_master_connection unless master_established connection.create_database configuration["database"], configuration.merge("collation" => default_collation) establish_connection configuration - rescue ActiveRecord::StatementInvalid => error - if /database .* already exists/i === error.message + rescue ActiveRecord::StatementInvalid => e + if /database .* already exists/i === e.message raise DatabaseAlreadyExists else raise From 4123e780d218e98247dd73c0863c19093b7b3f7a Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:00:13 +0100 Subject: [PATCH 3/8] Rubocop: Enable Naming/FileName cop --- .rubocop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 1f6fd0a3d..4d5ed898d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,5 +4,9 @@ AllCops: Layout/LineLength: Max: 120 +Naming/FileName: + Exclude: + - lib/activerecord-sqlserver-adapter.rb + Style/StringLiterals: EnforcedStyle: double_quotes From d3aa43b1f1a4f1ceb093f3069242fc439b3a516d Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:01:02 +0100 Subject: [PATCH 4/8] Rubocop: Enable Naming/BinaryOperatorParameterName cop --- lib/active_record/connection_adapters/sqlserver/utils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_record/connection_adapters/sqlserver/utils.rb b/lib/active_record/connection_adapters/sqlserver/utils.rb index c574dc693..3a7a71635 100644 --- a/lib/active_record/connection_adapters/sqlserver/utils.rb +++ b/lib/active_record/connection_adapters/sqlserver/utils.rb @@ -61,8 +61,8 @@ def quoted_raw quote @raw_name end - def ==(o) - o.class == self.class && o.parts == parts + def ==(other) + other.class == self.class && other.parts == parts end alias_method :eql?, :== From 477144797b427c976641a908a141baadfa6756ca Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:11:23 +0100 Subject: [PATCH 5/8] Rubocop: Disable Naming/AccessorMethodName cop --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 4d5ed898d..f73aa4c9d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,6 +4,9 @@ AllCops: Layout/LineLength: Max: 120 +Naming/AccessorMethodName: + Enabled: false + Naming/FileName: Exclude: - lib/activerecord-sqlserver-adapter.rb From 4ec85901f38888dd49f1ae4506b29e7b7047c857 Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:17:02 +0100 Subject: [PATCH 6/8] Rubocop: Enable Naming/MethodName cop --- .rubocop.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index f73aa4c9d..8cc702ce4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,5 +11,13 @@ Naming/FileName: Exclude: - lib/activerecord-sqlserver-adapter.rb +Naming/MethodName: + IgnoredPatterns: + - visit_.* + - primary_Key_From_Table + - table_From_Statement + - distinct_One_As_One_Is_So_Not_Fetch + - make_Fetch_Possible_And_Deterministic + Style/StringLiterals: EnforcedStyle: double_quotes From 63e06ccef72bb879cbb7a040ad9747b54141970e Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:19:08 +0100 Subject: [PATCH 7/8] Rubocop: Disable Naming/MethodParameterName cop --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 8cc702ce4..da16b3391 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -19,5 +19,8 @@ Naming/MethodName: - distinct_One_As_One_Is_So_Not_Fetch - make_Fetch_Possible_And_Deterministic +Naming/MethodParameterName: + Enabled: false + Style/StringLiterals: EnforcedStyle: double_quotes From 56df14aba64da134d98e085c69d66adb9f87f248 Mon Sep 17 00:00:00 2001 From: Wanderson Policarpo Date: Sat, 16 May 2020 15:27:15 +0100 Subject: [PATCH 8/8] Rubocop: Disable Naming/PredicateName cop --- .rubocop.yml | 3 +++ CHANGELOG.md | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index da16b3391..048b917d8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -22,5 +22,8 @@ Naming/MethodName: Naming/MethodParameterName: Enabled: false +Naming/PredicateName: + Enabled: false + Style/StringLiterals: EnforcedStyle: double_quotes diff --git a/CHANGELOG.md b/CHANGELOG.md index afa558b55..4f6608997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ #### Fixed - [#720](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/720) quoted_date doesn't work for Type::DateTime + +#### Changed + - [#826](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/826) Rubocop: Enable Style/StringLiterals cop - [#827](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/827) Rubocop: Enable Layout/EmptyLinesAroundClassBody cop - [#828](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/828) Rubocop: Enable Layout/EmptyLines cop @@ -12,6 +15,7 @@ - [#832](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/832) Rubocop: Enable Bundler cops - [#833](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/833) Rubocop: Enable Layout/* cops - [#834](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/834) Rubocop: Enable Lint/UselessAssignment cop +- [#835](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/835) Rubocop: Configure Naming cops ## v6.0.0.rc1