database_consistency 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6abf040aee5da4569c129d448c0b9dcc2344ace31f64ffad808f1f225f7328
-  data.tar.gz: ccc59e66ac21cee7e6f71cf1d994dc65c09c5706343396af90af7a4b157a6ac8
+  metadata.gz: f0c1477361d612a93d643987fff549de519a50d8452b1019c04f32766598078a
+  data.tar.gz: 5132d1568f2573ef5a2bfdeb34321d29f8bc4938f2cc7fa3e75e383dec8a22d6
 SHA512:
-  metadata.gz: 1617cef7111b2d5e3cca1f003176b1477b27529c1b433dc04a6131c1efff1b2ba8c1291637cd9fa4e169736c10807fa21b12f4c48197175596226d73814e64eb
-  data.tar.gz: 87aa6bf2daaf34aec66256af9b999cc20e09587a71441b151e88a0616fba0c8c907e34ea4497b89c432538d8d0c59b78d27c8dda4f5222f3ca5ec6e759276951
+  metadata.gz: f3b9c74967fa7143dca1606de94d9ff18ed48553a1dc916a255f012e22f2509ead5ed943ec1b331fdac9bd11a41a5a0c5549948b9961ace82c374b17dfa9b064
+  data.tar.gz: 59cfde80772740f400642739011136f1292dc9c34540835f534f77cac7c2fe4a25d44dc279553b29ee93137dfb718815a08c07b663fd1e8c5fa949fa3003b0da

data/lib/database_consistency/helper.rb

@@ -78,17 +78,23 @@ module DatabaseConsistency
     end
 
     def uniqueness_validator_columns(attribute, validator, model)
-      ([wrapped_attribute_name(attribute, validator)] + scope_columns(validator, model)).map(&:to_s)
+      ([wrapped_attribute_name(attribute, validator, model)] + scope_columns(validator, model)).map(&:to_s)
     end
 
     def scope_columns(validator, model)
       Array.wrap(validator.options[:scope]).map do |scope_item|
-        model._reflect_on_association(scope_item)&.foreign_key || scope_item
+        foreign_key_or_attribute(model, scope_item)
       end
     end
 
+    def foreign_key_or_attribute(model, attribute)
+      model._reflect_on_association(attribute)&.foreign_key || attribute
+    end
+
     # @return [String]
-    def wrapped_attribute_name(attribute, validator)
+    def wrapped_attribute_name(attribute, validator, model)
+      attribute = foreign_key_or_attribute(model, attribute)
+
       if validator.options[:case_sensitive].nil? || validator.options[:case_sensitive]
         attribute
       else

data/lib/database_consistency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatabaseConsistency
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord