forest_liana 9.17.2 → 9.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ec79f4e42ec91b8c5306d87672aab03a6b30072e88e27fdcb311d3d7d2c8de
-  data.tar.gz: e5f37934ccdbf40a78499fd22fcafcd037b8eed1b12034c773bbb499d16b60c7
+  metadata.gz: b7a86f85b47098ca555b8f032bec32c813acc38ab3f3c4a1195d144d3a87aed1
+  data.tar.gz: 658e86bf9a50f4301de598982879ef511b022901f1f2841c48d6e244efb4dbd5
 SHA512:
-  metadata.gz: 93d789834be64fe90cdc9b58c8201df5b75396d627a1138ec1d46e437cfb60d7d63246ece332db3890a6a0cb5eb672683655abc5736dc5c85d38ab2aea47e41a
-  data.tar.gz: 91b3c9bf5856f4b628ca31b4140bab3f00b96bd3a7afe670cefaa8701499a86e2fca9e0c431b7a621c86283bae0eefa13afb5104f25ad89589105eb007fa34b9
+  metadata.gz: 87b9319960622c67bf4bbea12e4a31447daf30e640a6d85c259dc857a3acec043edbb34b10cccd676d8a050e00068e343ba778e550c79821967ae78885d39360
+  data.tar.gz: 60a672c6dd59c250d973a4afd9e1738650106eab342f1af3a260ce6437e660e1e87a20613252bd0d826cec1bb262bbf3bc6dc2822e1db42aadfc237d075d5f36

data/app/services/forest_liana/resources_getter.rb

@@ -343,23 +343,44 @@ module ForestLiana
         association = get_one_association(path)
         if association
           through_chain = []
-          while association.options[:through]
-            through_chain << association.options[:through]
-            association = get_one_association(association.options[:through])
+          current_association = association
+          while current_association.options[:through]
+            through_chain << current_association.options[:through]
+            current_association = get_one_association(current_association.options[:through])
           end
 
           # Skip ActiveStorage associations - already processed above
           next if is_active_storage_association?(association)
 
-          # For :through associations, only add foreign keys from the direct (first) association in the chain
-          # Don't try to select columns from the main table for the final :through target
+          # For :through associations, recursively add all intermediate foreign keys
           if through_chain.any?
-            # Use the first association in the through chain
-            first_through = get_one_association(through_chain.first)
-            if first_through && (first_through.macro == :belongs_to || first_through.macro == :has_one)
-              foreign_keys = Array(first_through.foreign_key)
-              foreign_keys.each do |fk|
-                select << "#{@resource.table_name}.#{fk}"
+            current_resource = @resource
+            through_chain.reverse.each do |through_name|
+              through_assoc = current_resource.reflect_on_association(through_name)
+
+              if through_assoc
+                if through_assoc.options[:through]
+                  direct_through_name = through_assoc.options[:through]
+                  direct_assoc = current_resource.reflect_on_association(direct_through_name)
+
+                  if direct_assoc && (direct_assoc.macro == :belongs_to || direct_assoc.macro == :has_one)
+                    fks = Array(direct_assoc.foreign_key)
+                    fks.each do |fk|
+                      select << "#{current_resource.table_name}.#{fk}"
+                    end
+                  end
+                else
+                  # Direct association (not nested through)
+                  if through_assoc.macro == :belongs_to || through_assoc.macro == :has_one
+                    fks = Array(through_assoc.foreign_key)
+                    fks.each do |fk|
+                      select << "#{current_resource.table_name}.#{fk}"
+                    end
+                  end
+                end
+
+                # Move to the next level in the chain
+                current_resource = through_assoc.klass if through_assoc.klass
               end
             end
           else
@@ -369,8 +390,8 @@ module ForestLiana
             end
 
             if association.macro == :belongs_to || association.macro == :has_one
-              foreign_keys = Array(association.foreign_key)
-              foreign_keys.each do |fk|
+              fks = Array(association.foreign_key)
+              fks.each do |fk|
                 select << "#{@resource.table_name}.#{fk}"
               end
             end
@@ -394,7 +415,11 @@ module ForestLiana
             end
           end
         else
-          select << "#{@resource.table_name}.#{path}"
+          # Only add as column if it's not an association
+          # Associations are handled by the through chain logic above
+          unless association
+            select << "#{@resource.table_name}.#{path}"
+          end
         end
       end
 

data/app/services/forest_liana/search_query_builder.rb

@@ -75,7 +75,11 @@ module ForestLiana
             end
           # NOTICE: Rails 3 do not have a defined_enums method
           elsif REGEX_UUID.match(@search) && column.type == :uuid
-            conditions << "#{column_name}  = :search_value_for_uuid"
+            if column.respond_to?(:array) && column.array
+              conditions << ":search_value_for_uuid = ANY(#{column_name})"
+            else
+              conditions << "#{column_name}  = :search_value_for_uuid"
+            end
           elsif @resource.respond_to?(:defined_enums) &&
             @resource.defined_enums.has_key?(column.name) &&
             !@resource.defined_enums[column.name][@search.downcase].nil?

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.17.2"
+  VERSION = "9.17.4"
 end

data/spec/services/forest_liana/search_query_builder_spec.rb

@@ -0,0 +1,48 @@
+module ForestLiana
+  describe SearchQueryBuilder do
+    let(:user) { { 'id' => '1', 'rendering_id' => 1 } }
+    let(:collection) { ForestLiana::Model::Collection.new(name: 'Tree', fields: []) }
+    let(:search_uuid) { '75fbcb43-f6f8-4cd1-861f-09a61fd1ddad' }
+    let(:params) { { search: search_uuid, searchExtended: '0' } }
+    let(:builder) { described_class.new(params, [], collection, user) }
+
+    before do
+      allow(ForestLiana::ScopeManager)
+        .to receive(:append_scope_for_user)
+        .and_return(nil)
+      allow(ForestLiana)
+        .to receive(:schema_for_resource)
+        .and_return(ForestLiana::Model::Collection.new(name: 'Tree', fields: []))
+    end
+
+    describe '#perform' do
+      context 'when a column is an array uuid type' do
+        let(:array_uuid_column) do
+          double('Column', name: 'attachment_ids', type: :uuid, array: true).tap do |col|
+            allow(col).to receive(:respond_to?).with(:array).and_return(true)
+          end
+        end
+
+        let(:normal_uuid_column) do
+          double('Column', name: 'external_id', type: :uuid, array: false).tap do |col|
+            allow(col).to receive(:respond_to?).with(:array).and_return(true)
+          end
+        end
+
+        before do
+          allow(Tree).to receive(:columns).and_return([array_uuid_column, normal_uuid_column])
+        end
+
+        it 'searches the array column using ANY() syntax' do
+          result = builder.perform(Tree.all)
+          expect(result.to_sql).to match(/= ANY.*attachment_ids/i)
+        end
+
+        it 'searches the non-array uuid column using equality syntax' do
+          result = builder.perform(Tree.all)
+          expect(result.to_sql).to match(/"external_id"\s+=\s+'#{search_uuid}'/i)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.17.2
+  version: 9.17.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-20 00:00:00.000000000 Z
+date: 2026-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -465,6 +465,7 @@ files:
 - spec/services/forest_liana/schema_adapter_default_values_spec.rb
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/search_query_builder_spec.rb
 - spec/services/forest_liana/serializer_factory_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
 - spec/services/forest_liana/smart_action_form_parser_spec.rb
@@ -775,6 +776,7 @@ test_files:
 - spec/services/forest_liana/schema_adapter_default_values_spec.rb
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/search_query_builder_spec.rb
 - spec/services/forest_liana/serializer_factory_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
 - spec/services/forest_liana/smart_action_form_parser_spec.rb