forest_liana 9.20.1 → 9.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6590ae4597f44757af9a98c3f4d8ba9e83652eedd857f45aeb1fe365e8a8ae
-  data.tar.gz: 5aa5f3150171dd65dac411007c311b9cb5409c9eb97d1a415d31e908001b0d34
+  metadata.gz: de38bb4323a6676a9185bee03e2ba490c9b9bc2be0fcb41e213849ef9755c9f2
+  data.tar.gz: 54e8bd60a653ecdf126480f2530b15cf52c024d9b69acd3152fd7ffa86f52c0e
 SHA512:
-  metadata.gz: 6d848b970f6f68edd2a162f40e546740878c6fc7e2b298a3c494f6641fce908b41e2412a9e3457d13edef7d6433ce9f5704b77604851b2fd7aeca5eb60cfe691
-  data.tar.gz: 2828ff99f57028970cc2ec4e1662b70203d0d077ca0bbb45350dd4d29d09bffaffd1ef907b923e666cfc28704f97db62358bdf6709cf4b7c16bac822cd1afa15
+  metadata.gz: c319db67ae5621fd89a52d86e02022b73c4a2872763ec1cc48ef5a43c0f9b47b0ae3fa4927c1d180b60d0af83dfaa6085e788f8e66b91c3213c804a9e5fc56b6
+  data.tar.gz: 2d59d2fb65f0b2c05e189e11d25d20dcf9980fe9dc23d4c1f14c96050a7ef67bc7e162731b0fe5f6c0a717557ba9b8b12d98d4481197abc21a69b9d2a1c5b900

data/app/services/forest_liana/schema_adapter.rb

@@ -266,6 +266,9 @@ module ForestLiana
             }
 
             collection.fields = collection.fields.reject do |field|
+              # NOTICE: A primary key column must survive; a type column is never one.
+              next false if field[:is_primary_key]
+
               field[:field] == association.foreign_key || field[:field] == association.foreign_type
             end
           # NOTICE: Delete the association if the targeted model is excluded.
@@ -274,7 +277,8 @@ module ForestLiana
               x[:field] == association.foreign_key
             end
 
-            collection.fields.delete(field) if field
+            # NOTICE: A primary key column must survive, even as an excluded association's FK.
+            collection.fields.delete(field) if field && !field[:is_primary_key]
           # NOTICE: The foreign key exists, so it's a belongsTo relationship.
           elsif (field = column_association(collection, association)) &&
             [:has_one, :belongs_to].include?(association.macro)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.20.1"
+  VERSION = "9.20.2"
 end

data/test/services/forest_liana/schema_adapter_test.rb

@@ -86,6 +86,62 @@ module ForestLiana
       ForestLiana.apimap << original if original
     end
 
+    test 'a primary key column that is also the foreign key of an excluded association is kept' do
+      excluded_models = ForestLiana.excluded_models
+      name = ForestLiana.name_for(BelongsToField)
+      original = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(original) if original
+      ForestLiana.excluded_models = [ForestLiana.name_for(HasOneField)]
+      BelongsToField.define_singleton_method(:primary_key) { 'has_one_field_id' }
+
+      schema = SchemaAdapter.new(BelongsToField).perform
+      field = schema.fields.find { |f| f[:field] == 'has_one_field_id' }
+
+      refute_nil field, 'the primary key column must not be deleted'
+      assert_equal true, field[:is_primary_key]
+    ensure
+      BelongsToField.singleton_class.send(:remove_method, :primary_key)
+      ForestLiana.excluded_models = excluded_models
+      rebuilt = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(rebuilt) if rebuilt
+      ForestLiana.apimap << original if original
+    end
+
+    test 'an ordinary foreign key of an excluded association is still deleted' do
+      excluded_models = ForestLiana.excluded_models
+      name = ForestLiana.name_for(BelongsToField)
+      original = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(original) if original
+      ForestLiana.excluded_models = [ForestLiana.name_for(HasOneField)]
+
+      schema = SchemaAdapter.new(BelongsToField).perform
+
+      assert_nil schema.fields.find { |f| f[:field] == 'has_one_field_id' }
+    ensure
+      ForestLiana.excluded_models = excluded_models
+      rebuilt = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(rebuilt) if rebuilt
+      ForestLiana.apimap << original if original
+    end
+
+    test 'a primary key column that is also a polymorphic foreign key is kept' do
+      name = ForestLiana.name_for(PolymorphicField)
+      original = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(original) if original
+      PolymorphicField.define_singleton_method(:primary_key) { 'has_one_field_id' }
+
+      schema = SchemaAdapter.new(PolymorphicField).perform
+      field = schema.fields.find { |f| f[:field] == 'has_one_field_id' }
+
+      refute_nil field, 'the primary key column must not be rejected'
+      assert_equal true, field[:is_primary_key]
+    ensure
+      PolymorphicField.singleton_class.send(:remove_method, :primary_key)
+      rebuilt = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(rebuilt) if rebuilt
+      ForestLiana.apimap << original if original
+    end
+
     test 'belongsTo relationship' do
       schema = SchemaAdapter.new(BelongsToField).perform
       fields = schema.fields.select do |field|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.20.1
+  version: 9.20.2
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-23 00:00:00.000000000 Z
+date: 2026-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails