forest_liana 9.14.1 → 9.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36ceb8802f17dd57f5c777b1d0c47570ee12259c78048735ad9bd75166e099d
-  data.tar.gz: 4eb56b56fb1392a0750f0e522676b15e34d83ae725b5218010685ca278b7d10b
+  metadata.gz: 82aa2dffa179fa0be6398321388077e3ad04f66583969c4fbb68112983dcd5d6
+  data.tar.gz: 9e84f6554455e681cf00ca15cee8bb337c4e9ae22289e11959caa889297a0ee1
 SHA512:
-  metadata.gz: 8db001396703db0cd5277f501e93fa43efaf771baa8852e561d5dcf706a862e6bceaa20ababeed0702aae66ebea3961b33257308356a175e47ed2a08193364ff
-  data.tar.gz: 313aed4b4ac152cd4baba032f875016d1c87162a04e957851f4ed9495eebdf8104aaea238db0ea5442a7213661697d5b8acbcbaa2686f4ab4af83cd095ac0879
+  metadata.gz: 0cd4367dcab7b965bccf0b49e289509ce0b97b9763491b67273444c06db7a226d4c1fc019da63167567de45afcb752fb76751b4512d0c5ff0754f217679bac0d
+  data.tar.gz: 67eb9531fc902db2a9db22cffb6b53ba2f5ff9635f67ef5668db5b107102fb2ddac46b901fa56a7ac245c0fff3215c064b66cede4c37ea819985ce78539346dd

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/has_many_getter.rb

@@ -62,9 +62,8 @@ module ForestLiana
     end
 
     def field_names_requested
-      return nil unless @params[:fields] && @params[:fields][@collection_name]
-      @params[:fields][@collection_name].split(',')
-        .map { |name| name.to_sym }
+      fields = @params.dig(:fields, @collection_name)
+      Array(fields&.split(',')).map(&:to_sym)
     end
 
     def model_association

data/app/services/forest_liana/resources_getter.rb

@@ -32,7 +32,7 @@ module ForestLiana
     def perform
       polymorphic_association, preload_loads = analyze_associations(@resource)
       includes = @includes.uniq - polymorphic_association - preload_loads - @optional_includes
-      has_smart_fields =  @params[:fields][@collection_name].split(',').any? do |field|
+      has_smart_fields = Array(@params.dig(:fields, @collection_name)&.split(',')).any? do |field|
         ForestLiana::SchemaHelper.is_smart_field?(@resource, field)
       end
 
@@ -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,34 +124,27 @@ 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)
 
-      base_fields.uniq
+      # Ensure the foreign key is present for manual binding (especially for has_one)
+      columns << association.foreign_key.to_sym if association.macro == :has_one
+
+      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
 
-          if @params[:fields].key?(association_name) &&
-            @params[:fields][association_name].split(',').size == 1 &&
-            @params[:fields][association_name].split(',').include?(association.klass.primary_key)
-
+          fields = @params[:fields]&.[](association_name)&.split(',')
+          if fields&.size == 1 && fields.include?(association.klass.primary_key)
             @field_names_requested << association.foreign_key
             @optional_includes << association.name
           end
@@ -175,7 +167,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
 
@@ -194,7 +189,7 @@ module ForestLiana
     end
 
     def field_names_requested
-      return nil unless @params[:fields] && @params[:fields][@collection_name]
+      return [] unless @params.dig(:fields, @collection_name)
 
       associations_for_query = extract_associations_from_filter
       associations_for_query << @params[:sort].split('.').first.to_sym if @params[:sort]&.include?('.')
@@ -335,11 +330,12 @@ module ForestLiana
           select << "#{@resource.table_name}.#{association.foreign_key}"
         end
 
-        if @params[:fields].key?(path)
+        fields = @params[:fields]&.[](path)&.split(',')
+        if fields
           association = get_one_association(path)
           table_name = association.table_name
 
-          @params[:fields][path].split(',').each do |association_path|
+          fields.each do |association_path|
             if ForestLiana::SchemaHelper.is_smart_field?(association.klass, association_path)
               association.klass.attribute_names.each { |attribute| select << "#{table_name}.#{attribute}" }
             else

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.3"
 end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -572,6 +572,26 @@ module ForestLiana
           expect(records.second.name).to eq 'Treasure'
         end
       end
+
+      describe '#perform' do
+        let(:resource) { User }
+        let(:fields) { nil }
+        let(:sort) { nil }
+        let(:filters) { nil }
+
+        it 'does not raise an error when params[:fields] is nil' do
+          expect {
+            getter.perform
+          }.not_to raise_error
+
+          records = getter.records
+          count = getter.count
+
+          expect(records).to all(be_a(User))
+          expect(count).to eq User.count
+        end
+      end
+
     end
   end
 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.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-28 00:00:00.000000000 Z
+date: 2025-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails