strict_associations 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3840cb8da5c485000f4837ba8eb88d348ed314157e726746334a25ba902c9eb
-  data.tar.gz: abe99225f8efdeb73b5425d1e6ae161e7c441fd556d36e08849e6da8d2fa36d2
+  metadata.gz: fbe650347474030e15a049132a0e002e1a0dd421fd747d6b0a4c6cc2e8efce91
+  data.tar.gz: 31ba848896030b174536c90bca7f4970a24272958bb8f15b7d85c03897ad0da7
 SHA512:
-  metadata.gz: d8773b7689493980c772e795e5d4c601abd268e715baa74db4b83c9e88fd80e4a3c9dbd603fc8b0573125d491a391a5fac3cef6a9cab01106656b1952ff2dd3b
-  data.tar.gz: 249247cb1a40bf234d2aeb77ba209e732390b6bbaf861543b986e01b192d8d9083a991f1ad0d100fee6038db638620447ec62f1c4e871967d1576c0cee66c912
+  metadata.gz: d290a381bce9063d13f5f6134145b4d05883681a28e3ac4b9fc44415846e7e0561ecdfdbe48572febfb8341f764c96ce1b68fe61ac2ee3715257c4d0e044ce21
+  data.tar.gz: 4d872852b7716e934d3271af605f6264714601d262f0c1bdc7841310e4a1251c0acaffc82f4fa4610e552a5348bc4c5f317b07cd8eb55149f8b90609049219b7

data/CHANGELOG.md

@@ -2,6 +2,6 @@
 
 
 
-## [0.1.6] - Unreleased
+## [0.1.7] - Unreleased
 
-## [0.1.5] - Unreleased
+## [0.1.6] - Unreleased

data/lib/strict_associations/validator.rb

@@ -241,16 +241,16 @@ module StrictAssociations
       return unless owns_table?(model)
 
       is_third_party = third_party?(model)
-      indexed_fk_columns = indexed_foreign_key_columns(model)
+      fk_columns = database_foreign_key_columns(model)
       defined_fk_columns = sti_family_foreign_keys(model)
 
-      (indexed_fk_columns - defined_fk_columns).each do |column|
+      (fk_columns - defined_fk_columns).each do |column|
         assoc_name = column.delete_suffix("_id").to_sym
         next if model.strict_association_skipped?(assoc_name)
 
         msg = if is_third_party
           <<~MSG.squish
-            #{model} (third-party) has an indexed column #{column} \
+            #{model} (third-party) has a foreign key #{column} \
             with no corresponding belongs_to. If this FK references \
             one of your models, define a has_many on your model \
             pointing back. Or call skip_strict_association \
@@ -258,11 +258,12 @@ module StrictAssociations
           MSG
         else
           <<~MSG.squish
-            #{model.table_name} has an indexed column #{column} but \
+            #{model.table_name} has a foreign key #{column} but \
             #{model} has no belongs_to association for it.
             Define a belongs_to.
-            Or remove the index.
-            Or call skip_strict_association :#{assoc_name} on #{model}.
+            Or remove the foreign key.
+            Or call skip_strict_association :#{assoc_name} \
+            on #{model}.
           MSG
         end
 
@@ -291,14 +292,10 @@ module StrictAssociations
       end.uniq
     end
 
-    def indexed_foreign_key_columns(model)
-      model.connection.indexes(model.table_name).filter_map do |index|
-        columns = index.columns
-        next unless columns.is_a?(Array) && columns.one?
-        next unless columns.first.end_with?("_id")
-
-        columns.first
-      end
+    def database_foreign_key_columns(model)
+      model.connection
+        .foreign_keys(model.table_name)
+        .map(&:column)
     end
 
     def resolve_target(reflection)

data/lib/strict_associations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StrictAssociations
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strict_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jeff Lange