forest_liana 9.14.1 → 9.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36ceb8802f17dd57f5c777b1d0c47570ee12259c78048735ad9bd75166e099d
-  data.tar.gz: 4eb56b56fb1392a0750f0e522676b15e34d83ae725b5218010685ca278b7d10b
+  metadata.gz: a594bcf7830da0f415fbfadfa90d985e46814d07cda6892f317f1834db731ce3
+  data.tar.gz: a565c34a7ef4c7b6e637818963a76b11d772cd716b3eed1db7ffe6b4e8711d2f
 SHA512:
-  metadata.gz: 8db001396703db0cd5277f501e93fa43efaf771baa8852e561d5dcf706a862e6bceaa20ababeed0702aae66ebea3961b33257308356a175e47ed2a08193364ff
-  data.tar.gz: 313aed4b4ac152cd4baba032f875016d1c87162a04e957851f4ed9495eebdf8104aaea238db0ea5442a7213661697d5b8acbcbaa2686f4ab4af83cd095ac0879
+  metadata.gz: c12bd80a362e62935a333d6c9b3df3e8bee0618cb29ef3f0a3677d50b4a33b79a66a09e42b38b3ca2a72cb15c2fdef5542d08a4b190f03ce270ed35ce0d951e4
+  data.tar.gz: f0a9ea3a170fff1bab99b583d7c5cc491740ffec9b8f48f6de8eee29bc497c77a7d28db34f49b53e08ee49957a3601c4b37be074a4f2a9a7ee1e427fca5df5a8

data/app/services/forest_liana/base_getter.rb

@@ -47,6 +47,8 @@ module ForestLiana
     end
 
     def separate_database?(resource, association)
+      return false if SchemaUtils.polymorphic?(association)
+
       target_model_connection = association.klass.connection
       target_model_database = target_model_connection.current_database if target_model_connection.respond_to? :current_database
       resource_connection = resource.connection

data/app/services/forest_liana/resources_getter.rb

@@ -58,7 +58,7 @@ module ForestLiana
       records = @records.offset(offset).limit(limit).to_a
       polymorphic_association, preload_loads = analyze_associations(@resource)
 
-      if polymorphic_association && Rails::VERSION::MAJOR >= 7
+      if polymorphic_association.any? && Rails::VERSION::MAJOR >= 7
         preloader = ActiveRecord::Associations::Preloader.new(records: records, associations: polymorphic_association)
         preloader.loaders
         preloader.branches.each do |branch|
@@ -85,7 +85,6 @@ module ForestLiana
         next unless separate_database?(@resource, association)
 
         columns = columns_for_cross_database_association(association_name)
-
         if association.macro == :belongs_to
           foreign_key = association.foreign_key
           primary_key = association.klass.primary_key
@@ -125,27 +124,22 @@ module ForestLiana
     end
 
     def columns_for_cross_database_association(association_name)
-      return [:id] unless @params[:fields].present?
-
-      fields = @params[:fields][association_name.to_s]
-      return [:id] unless fields
-
-      base_fields = fields.split(',').map(&:strip).map(&:to_sym) | [:id]
-
       association = @resource.reflect_on_association(association_name)
-      extra_key = association.foreign_key
 
-      # Add the foreign key used for the association to ensure it's available in the preloaded records
-      # This is necessary for has_one associations, without it calling record.public_send(foreign_key) would raise a "missing attribute" error
-      base_fields << extra_key if association.macro == :has_one
+      # Always include all columns of the associated model to avoid missing attribute errors
+      columns = association.klass.column_names.map(&:to_sym)
+
+      # Ensure the foreign key is present for manual binding (especially for has_one)
+      columns << association.foreign_key.to_sym if association.macro == :has_one
 
-      base_fields.uniq
+      columns.uniq
     end
 
     def compute_includes
       associations_has_one = ForestLiana::QueryHelper.get_one_associations(@resource)
+
       @optional_includes = []
-      if @field_names_requested
+      if @field_names_requested && @params['searchExtended'].to_i != 1
         includes = associations_has_one.map do |association|
           association_name = association.name.to_s
 
@@ -175,7 +169,10 @@ module ForestLiana
 
         @includes = (includes & @field_names_requested).concat(includes_for_smart_search)
       else
-        @includes = associations_has_one.map(&:name)
+        @includes = associations_has_one
+                      # Avoid eager loading has_one associations pointing to a different database as ORM can't join cross databases
+                      .reject { |association| separate_database?(@resource, association) }
+                      .map(&:name)
       end
     end
 

data/app/services/forest_liana/schema_adapter.rb

@@ -278,7 +278,13 @@ module ForestLiana
               field[:field] = association.name
               field[:inverse_of] = inverse_of(association)
               field[:relationship] = get_relationship_type(association)
-          # NOTICE: Create the fields of hasOne, HasMany, … relationships.
+
+              ForestLiana::SchemaUtils.disable_filter_and_sort_if_cross_db!(
+                field,
+                association.name.to_s,
+                ForestLiana.name_for(@model)
+              )
+              # NOTICE: Create the fields of hasOne, HasMany, … relationships.
           else
             collection.fields << get_schema_for_association(association)
           end
@@ -346,7 +352,7 @@ module ForestLiana
     end
 
     def get_schema_for_association(association)
-      {
+      opts ={
         field: association.name.to_s,
         type: get_type_for_association(association),
         relationship: get_relationship_type(association),
@@ -363,6 +369,14 @@ module ForestLiana
         widget: nil,
         validations: []
       }
+
+      ForestLiana::SchemaUtils.disable_filter_and_sort_if_cross_db!(
+        opts,
+        association.name.to_s,
+        ForestLiana.name_for(@model)
+      )
+
+      opts
     end
 
     def get_relationship_type(association)

data/app/services/forest_liana/schema_utils.rb

@@ -126,5 +126,27 @@ module ForestLiana
     def self.is_active_type? model
       Object.const_defined?('ActiveType::Object') && model < ActiveType::Object
     end
+
+    def self.disable_filter_and_sort_if_cross_db!(opts, name, collection_name)
+      return unless opts[:reference]
+
+      assoc_name = opts[:reference].split('.').first&.underscore&.to_sym || name
+      model = find_model_from_collection_name(collection_name)
+      return unless model
+
+      association = model.reflect_on_association(assoc_name)
+      return unless association
+      return if polymorphic?(association)
+
+      model_db = model.connection_db_config.database
+      assoc_db = association.klass.connection_db_config.database
+
+      if model_db != assoc_db
+        opts[:is_filterable] = false
+        opts[:is_sortable] = false
+      end
+    rescue => e
+      FOREST_LOGGER.warn("Could not evaluate cross-db association for #{name}: #{e.message}")
+    end
   end
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.14.1"
+  VERSION = "9.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.14.1
+  version: 9.14.2
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-28 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails