Skip to content

Commit c3bdcf0

Browse files
authored
Merge pull request #835 from rails-sqlserver/rubocop-Naming
Rubocop: Configure Naming cops
2 parents fd2f41f + 56df14a commit c3bdcf0

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed

.rubocop.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,26 @@ AllCops:
44
Layout/LineLength:
55
Max: 120
66

7+
Naming/AccessorMethodName:
8+
Enabled: false
9+
10+
Naming/FileName:
11+
Exclude:
12+
- lib/activerecord-sqlserver-adapter.rb
13+
14+
Naming/MethodName:
15+
IgnoredPatterns:
16+
- visit_.*
17+
- primary_Key_From_Table
18+
- table_From_Statement
19+
- distinct_One_As_One_Is_So_Not_Fetch
20+
- make_Fetch_Possible_And_Deterministic
21+
22+
Naming/MethodParameterName:
23+
Enabled: false
24+
25+
Naming/PredicateName:
26+
Enabled: false
27+
728
Style/StringLiterals:
829
EnforcedStyle: double_quotes

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
#### Fixed
44

55
- [#720](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/720) quoted_date doesn't work for Type::DateTime
6+
7+
#### Changed
8+
69
- [#826](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/826) Rubocop: Enable Style/StringLiterals cop
710
- [#827](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/827) Rubocop: Enable Layout/EmptyLinesAroundClassBody cop
811
- [#828](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/828) Rubocop: Enable Layout/EmptyLines cop
@@ -12,6 +15,7 @@
1215
- [#832](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/832) Rubocop: Enable Bundler cops
1316
- [#833](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/833) Rubocop: Enable Layout/* cops
1417
- [#834](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/834) Rubocop: Enable Lint/UselessAssignment cop
18+
- [#835](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/835) Rubocop: Configure Naming cops
1519

1620
## v6.0.0.rc1
1721

lib/active_record/connection_adapters/sqlserver/utils.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ def quoted_raw
6161
quote @raw_name
6262
end
6363

64-
def ==(o)
65-
o.class == self.class && o.parts == parts
64+
def ==(other)
65+
other.class == self.class && other.parts == parts
6666
end
6767
alias_method :eql?, :==
6868

lib/active_record/tasks/sqlserver_database_tasks.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def create(master_established = false)
2121
establish_master_connection unless master_established
2222
connection.create_database configuration["database"], configuration.merge("collation" => default_collation)
2323
establish_connection configuration
24-
rescue ActiveRecord::StatementInvalid => error
25-
if /database .* already exists/i === error.message
24+
rescue ActiveRecord::StatementInvalid => e
25+
if /database .* already exists/i === e.message
2626
raise DatabaseAlreadyExists
2727
else
2828
raise

test/cases/column_test_sqlserver.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -759,12 +759,12 @@ def assert_obj_set_and_save(attribute, value)
759759
_(type.precision).must_be_nil
760760
_(type.scale).must_be_nil
761761
# Basic set and save.
762-
binary_data_20 = binary_data.to(20)
763-
_(binary_data_20.encoding).must_equal Encoding::BINARY
764-
obj.varbinary_49 = binary_data_20
765-
_(obj.varbinary_49).must_equal binary_data_20
762+
binary_data20 = binary_data.to(20)
763+
_(binary_data20.encoding).must_equal Encoding::BINARY
764+
obj.varbinary_49 = binary_data20
765+
_(obj.varbinary_49).must_equal binary_data20
766766
obj.save!
767-
_(obj.reload.varbinary_49).must_equal binary_data_20
767+
_(obj.reload.varbinary_49).must_equal binary_data20
768768
end
769769

770770
it "varbinary(max)" do

0 commit comments

Comments
 (0)