forest_liana 9.18.1 → 9.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8e72d0e55a7fcee31e0f8c292c459fa27cf16e761a762bf2b98bb3403d4de5
-  data.tar.gz: cb6b240fe4d578bd38f813e59bfbe09f55249c71425305193972eb242cd6d2ee
+  metadata.gz: 92281c1baf13dfbbdbe418f2a11833ad15a665c1109f1e4ad0a5f395e32ab090
+  data.tar.gz: 71946c62175f706e11528dbac2a3e7600f780a7847596be724c74675ef8299a0
 SHA512:
-  metadata.gz: f77c5a79408e893d6ea1e32dfa4cbcd940b5501c5982ce731598211f50d260a89f6344f35f1412905cb9061435dc41ae9e4d99cf20b86795a46f434f35cc0108
-  data.tar.gz: 945fa5c5c1144a49fb0916e6e322c1f67e9e4b44f9b9b731678afa19935a40c1c6694c161953314d2fd87ee40041b6308d1f947dcd8ff90313f506bb7da907e2
+  metadata.gz: f6eced39681d8c424791ed625807cb3ce9e8e741a9ed7f1ca711f225219219d2415cafa222b8df4eaa99185f57c98ca2f8766df724719d36e791af695ad1f2ee
+  data.tar.gz: 4df825ec3296694e8fcf7cdc0d7eb86a481667af477ce9b7e500ba69afdc1bb86d343049f2493d896c9a70dc19100f984dcd301e5da80703520cf17ae0121dcc

data/app/services/forest_liana/apimap_sorter.rb

@@ -31,6 +31,7 @@ module ForestLiana
       'widget',
       'validations',
       'polymorphic_referenced_models',
+      'foreign_key_type_field',
     ]
     KEYS_ACTION = [
       'name',

data/app/services/forest_liana/schema_adapter.rb

@@ -259,7 +259,10 @@ module ForestLiana
               relationships: nil,
               widget: nil,
               validations: [],
-              polymorphic_referenced_models: get_polymorphic_types(association)
+              polymorphic_referenced_models: get_polymorphic_types(association),
+              # NOTICE: Expose the discriminator column (e.g. "addressable_type")
+              #         so consumers can resolve which model a record targets.
+              foreign_key_type_field: association.foreign_type
             }
 
             collection.fields = collection.fields.reject do |field|
@@ -279,7 +282,8 @@ module ForestLiana
               field[:field] = association.name
               field[:inverse_of] = inverse_of(association)
               field[:relationship] = get_relationship_type(association)
-              field[:is_primary_key] = false
+              # NOTICE: Preserve is_primary_key from the underlying column; a
+              #         composite PK made of FKs would otherwise lose its flag.
 
               ForestLiana::SchemaUtils.disable_filter_and_sort_if_cross_db!(
                 field,

data/lib/forest_liana/schema_file_updater.rb

@@ -37,6 +37,7 @@ module ForestLiana
       'widget',
       'validations',
       'polymorphic_referenced_models',
+      'foreign_key_type_field',
     ]
     KEYS_VALIDATION = [
       'message',

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.18.1"
+  VERSION = "9.19.0"
 end

data/spec/lib/forest_liana/schema_file_updater_spec.rb

@@ -32,7 +32,8 @@ module ForestLiana
                     "relationships" => nil,
                     "widget" => nil,
                     "validations" => [],
-                    "polymorphic_referenced_models" => ["User"]
+                    "polymorphic_referenced_models" => ["User"],
+                    "foreign_key_type_field" => "addressable_type"
                   },
                 ],
                 "actions" => [],

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -26,7 +26,8 @@ module ForestLiana
               relationships: nil,
               widget: nil,
               validations: [],
-              polymorphic_referenced_models: ['User']
+              polymorphic_referenced_models: ['User'],
+              foreign_key_type_field: 'addressable_type'
             }
           )
         end

data/test/services/forest_liana/schema_adapter_test.rb

@@ -69,6 +69,23 @@ module ForestLiana
       assert_equal false, schema[:is_primary_key]
     end
 
+    test 'a foreign key composing the primary key keeps is_primary_key: true once turned into an association' do
+      name = ForestLiana.name_for(BelongsToField)
+      original = ForestLiana.apimap.find { |c| c.name.to_s == name }
+      ForestLiana.apimap.delete(original) if original
+      BelongsToField.define_singleton_method(:primary_key) { ['id', 'has_one_field_id'] }
+
+      schema = SchemaAdapter.new(BelongsToField).perform
+      field = schema.fields.find { |f| f[:field] == :has_one_field }
+
+      assert_equal true, field[:is_primary_key]
+    ensure
+      BelongsToField.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.18.1
+  version: 9.19.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-08 00:00:00.000000000 Z
+date: 2026-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails