forest_liana 9.17.2 → 9.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ec79f4e42ec91b8c5306d87672aab03a6b30072e88e27fdcb311d3d7d2c8de
-  data.tar.gz: e5f37934ccdbf40a78499fd22fcafcd037b8eed1b12034c773bbb499d16b60c7
+  metadata.gz: 6827e64710a291b05c5a7363b968d70dc1ce182f8a3f7f05ef25496f168ab261
+  data.tar.gz: 1afdf02d2d262fc58cfddc0bc845816f5b4a636069c15817d5d4963607d13734
 SHA512:
-  metadata.gz: 93d789834be64fe90cdc9b58c8201df5b75396d627a1138ec1d46e437cfb60d7d63246ece332db3890a6a0cb5eb672683655abc5736dc5c85d38ab2aea47e41a
-  data.tar.gz: 91b3c9bf5856f4b628ca31b4140bab3f00b96bd3a7afe670cefaa8701499a86e2fca9e0c431b7a621c86283bae0eefa13afb5104f25ad89589105eb007fa34b9
+  metadata.gz: 124e2c6349b38bc9dea8ec3821cd0918f14f08cbf3f89d141424407734a32dadead2d0b0d5e379498b725fc06a266ab50c4969389072591553fe9da94f53b4e3
+  data.tar.gz: a6e6d5c1f27d03abb33a0faa5f5f7fb77d879585cb3f299c9623e056e56921af785f650f2dbc69d5cc63bf1188336452dc93bb247ea3a59cfd325fd8ea577691

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/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.17.2"
+  VERSION = "9.17.3"
 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.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-20 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails