Skip to content

Commit 5f0371f

Browse files
committed
Improve wording for UniqueValidation description
1 parent 32ae8f0 commit 5f0371f

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

config/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ Rails/UniqBeforePluck:
819819
AutoCorrect: false
820820

821821
Rails/UniqueValidationWithoutIndex:
822-
Description: 'Uniqueness validation should be with a unique index.'
822+
Description: 'Uniqueness validation should have a unique index on the database column.'
823823
Enabled: true
824824
VersionAdded: '2.5'
825825
Include:

lib/rubocop/cop/rails/unique_validation_without_index.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module Rails
2727
class UniqueValidationWithoutIndex < Base
2828
include ActiveRecordHelper
2929

30-
MSG = 'Uniqueness validation should be with a unique index.'
30+
MSG = 'Uniqueness validation should have a unique index on the database column.'
3131
RESTRICT_ON_SEND = %i[validates].freeze
3232

3333
def on_send(node)

spec/rubocop/cop/rails/unique_validation_without_index_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class User < ApplicationRecord
2828
expect_offense(<<~RUBY)
2929
class User
3030
validates :account, uniqueness: true
31-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
31+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
3232
end
3333
RUBY
3434
end
@@ -48,7 +48,7 @@ class User
4848
expect_offense(<<~RUBY)
4949
class User
5050
validates :account, uniqueness: true
51-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
51+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
5252
end
5353
RUBY
5454
end
@@ -110,7 +110,7 @@ class User
110110
expect_offense(<<~RUBY)
111111
class WrittenArticles
112112
validates :user_id, uniqueness: { scope: :article_id }
113-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
113+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
114114
end
115115
RUBY
116116
end
@@ -155,7 +155,7 @@ class WrittenArticles
155155
class WrittenArticles
156156
belongs_to :author, polymorphic: true
157157
validates :title, uniqueness: { scope: :author }
158-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
158+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
159159
end
160160
RUBY
161161
end
@@ -247,7 +247,7 @@ class WrittenArticles
247247
expect_offense(<<~RUBY)
248248
class WrittenArticles
249249
validates :a_id, uniqueness: { scope: [:b_id, :c_id] }
250-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
250+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
251251
end
252252
RUBY
253253
end
@@ -301,7 +301,7 @@ class WrittenArticles
301301
class Article
302302
belongs_to :user
303303
validates :user, uniqueness: true
304-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
304+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
305305
end
306306
RUBY
307307
end
@@ -419,7 +419,7 @@ class User
419419
class Article
420420
belongs_to :member, foreign_key: :user_id
421421
validates :member, uniqueness: true
422-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
422+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
423423
end
424424
RUBY
425425
end
@@ -480,7 +480,7 @@ class Article
480480
class User
481481
self.table_name = 'members'
482482
validates :account, uniqueness: true
483-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
483+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
484484
end
485485
RUBY
486486
end
@@ -500,7 +500,7 @@ class User
500500
module Admin
501501
class User
502502
validates :account, uniqueness: true
503-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
503+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
504504
end
505505
end
506506
RUBY
@@ -510,7 +510,7 @@ class User
510510
expect_offense(<<~RUBY)
511511
class Admin::User
512512
validates :account, uniqueness: true
513-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
513+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
514514
end
515515
RUBY
516516
end
@@ -550,7 +550,7 @@ class Email < ApplicationRecord
550550
expect_offense(<<~RUBY)
551551
class Email < ApplicationRecord
552552
validates :address, presence: true, uniqueness: { case_sensitive: false }, email: true
553-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
553+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
554554
end
555555
RUBY
556556
end
@@ -572,7 +572,7 @@ class Email < ApplicationRecord
572572
expect_offense(<<~RUBY)
573573
class User
574574
validates :account, uniqueness: true
575-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should be with a unique index.
575+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Uniqueness validation should have a unique index on the database column.
576576
end
577577
RUBY
578578
end

0 commit comments

Comments
 (0)