diff --git a/.rubocop.yml b/.rubocop.yml index 1f6fd0a3d..048b917d8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,5 +4,26 @@ AllCops: Layout/LineLength: Max: 120 +Naming/AccessorMethodName: + Enabled: false + +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 + +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 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?, :== 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 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