database_consistency 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977b169b47dd5335a327746945ddd512717db1305744f44884d81bb0c7e82645
-  data.tar.gz: 59eb6c6ddefd09e77ba3f51dfbc2d4474eb92f62ca7b92437a4d9d70778d0d85
+  metadata.gz: f0c1477361d612a93d643987fff549de519a50d8452b1019c04f32766598078a
+  data.tar.gz: 5132d1568f2573ef5a2bfdeb34321d29f8bc4938f2cc7fa3e75e383dec8a22d6
 SHA512:
-  metadata.gz: 8b2b83f4ca288c7173f7abacc04c80f07b4d78c45f0fc949a801d1eb08b173c217ee524462eade7f443d9582243e593faa2730dd33e77e6d985f86c8ba86f6b4
-  data.tar.gz: e461a6da7caab598150602dac3f02075f4da00b9e68b481419e5717bb33fd3390d5e3f5b90c9ec315c2445af06812e435dafb3db81a7c2ced6cda4b957b035d0
+  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.0'
+  VERSION = '1.3.2'
 end

data/lib/database_consistency/writers/autofix/missing_foreign_key.rb

@@ -7,7 +7,7 @@ module DatabaseConsistency
         private
 
         def migration_name
-          "add_#{report.primary_table}_#{report.foreign_table}_foreign_key"
+          "add_#{report.primary_table}_#{report.primary_key}_#{report.foreign_table}_#{report.foreign_key}_fk"
         end
 
         def template_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,10 +195,19 @@ homepage: https://github.com/djezzzl/database_consistency
 licenses:
 - MIT
 metadata: {}
-post_install_message: "Thank you for using the gem!\n\nIf the project helps you or
-  your organization, I would be very grateful if you contribute or donate.  \nYour
-  support is an incredible motivation and the biggest reward for my hard work.\n\nhttps://github.com/djezzzl/database_consistency#contributing\nhttps://opencollective.com/database_consistency#support\n\nThank
-  you for your attention,\nEvgeniy Demin\n"
+post_install_message: |2+
+
+  Thank you for using the gem!
+
+  If the project helps you or your organization, I would be very grateful if you contribute or donate.
+  Your support is an incredible motivation and the biggest reward for my hard work.
+
+  https://github.com/djezzzl/database_consistency#contributing
+  https://opencollective.com/database_consistency#support
+
+  Thank you for your attention,
+  Evgeniy Demin
+
 rdoc_options: []
 require_paths:
 - lib