forest_liana 9.11.3 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd40a6f023ba4a2a7eddd15891ac11743dea8fee0df3378c42e604afbfe8c7e
-  data.tar.gz: 61ceac08bd477c79ea3d6284114b6a9a08f2514758378f4f7a96c3845efd4f8f
+  metadata.gz: 41634384199110d9a502915f8257c2e3ae3bb42553138cc3d178420de4ad2dea
+  data.tar.gz: 2c8ddb09bf770fd5f0dc8a051a0403a7caca8077becadf49444d11eede44eaab
 SHA512:
-  metadata.gz: e09c8a0a86cee9b238e35057b0e29e5b842fcf0a2a1380a57fb10bf00c9c2cf6cb5cf16bb9908d72fc4219966efa910742de673e5d0f9cd6696bbd83724d4f67
-  data.tar.gz: 24ecaa8c8a9442ec3c677bb71f47dbf8a120cba326732f202264869d1a3188265a30caa14054ffbd13c218deb6b13294ef997f60d83f0f347faccbc60d32bc98
+  metadata.gz: 5c25ddcb57957aa97d0e2fbb5a480a95821fb73d379ad3df207b6be05abc12e8181be943fca1845f499a14ba2aaa7df7e01df80d67eb272579cc490be652ba4b
+  data.tar.gz: 055f53038f537efca379093b048376ac044a1eb8e6c65a0305a7643fa95b2bd74313d7b9258d1daef6a21e62da40e48bb30db0498ee2bc85b8f284815237aa17

data/app/services/forest_liana/resources_getter.rb

@@ -30,7 +30,20 @@ module ForestLiana
     end
 
     def perform
-      @records = optimize_record_loading(@resource, @records)
+      polymorphic_association, preload_loads = analyze_associations(@resource)
+      includes = @includes.uniq - polymorphic_association - preload_loads
+      has_smart_fields =  @params[:fields][@collection_name].split(',').any? do |field|
+        ForestLiana::SchemaHelper.is_smart_field?(@resource, field)
+      end
+
+      if includes.empty? || has_smart_fields
+        @records = optimize_record_loading(@resource, @records)
+      else
+        select = compute_select_fields
+        @records = optimize_record_loading(@resource, @records).references(includes).select(*select)
+      end
+
+      @records
     end
 
     def count
@@ -210,5 +223,29 @@ module ForestLiana
     def pagination?
       @params[:page]&.dig(:number)
     end
+
+    def compute_select_fields
+      select = ['_forest_admin_eager_load']
+      @params[:fields][@collection_name].split(',').each do |path|
+        if @params[:fields].key?(path)
+          association = ForestLiana::QueryHelper.get_one_associations(@resource)
+                                                .select { |association| association.name == path.to_sym }
+                                                .first
+          table_name = association.table_name
+
+          @params[:fields][path].split(',').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
+              select << "#{table_name}.#{association_path}"
+            end
+          end
+        else
+          select << "#{@resource.table_name}.#{path}"
+        end
+      end
+
+      select
+    end
   end
 end

data/lib/forest_liana/active_record_override.rb

@@ -0,0 +1,65 @@
+module ForestLiana
+  module ActiveRecordOverride
+    module Associations
+      require 'active_record/associations/join_dependency'
+      module JoinDependency
+        def apply_column_aliases(relation)
+          if !(@join_root_alias = relation.select_values.empty?) &&
+            relation.select_values.first.to_s == '_forest_admin_eager_load'
+
+            relation.select_values.shift
+            used_cols = {}
+            # Find and expand out all column names being used in select(...)
+            new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, select|
+              unless col.include?(' ') # Pass it through if it's some expression (No chance for a simple column reference)
+                col = if (col_parts = col.split('.')).length == 1
+                  [col]
+                else
+                  [col_parts[0..-2].join('.'), col_parts.last]
+                end
+                used_cols[col] = nil
+              end
+              select << col
+            end
+
+            if new_select_values.present?
+              relation.select_values = new_select_values
+            else
+              relation.select_values.clear
+            end
+
+            @aliases ||= ActiveRecord::Associations::JoinDependency::Aliases.new(join_root.each_with_index.map do |join_part, i|
+              join_alias = join_part.table&.table_alias || join_part.table_name
+              keys = [join_part.base_klass.primary_key] # Always include the primary key
+
+              # # %%% Optional to include all foreign keys:
+              # keys.concat(join_part.base_klass.reflect_on_all_associations.select { |a| a.belongs_to? }.map(&:foreign_key))
+              # Add foreign keys out to referenced tables that we belongs_to
+              join_part.children.each { |child| keys << child.reflection.foreign_key if child.reflection.belongs_to? }
+
+              # Add the foreign key that got us here -- "the train we rode in on" -- if we arrived from
+              # a has_many or has_one:
+              if join_part.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation) &&
+                !join_part.reflection.belongs_to?
+                keys << join_part.reflection.foreign_key
+              end
+              keys = keys.compact # In case we're using composite_primary_keys
+              j = 0
+              columns = join_part.column_names.each_with_object([]) do |column_name, s|
+                # Include columns chosen in select(...) as well as the PK and any relevant FKs
+                if used_cols.keys.find { |c| (c.length == 1 || c.first == join_alias) && c.last == column_name } ||
+                  keys.find { |c| c == column_name }
+                  s << ActiveRecord::Associations::JoinDependency::Aliases::Column.new(column_name, "t#{i}_r#{j}")
+                end
+                j += 1
+              end
+              ActiveRecord::Associations::JoinDependency::Aliases::Table.new(join_part, columns)
+            end)
+            relation.select_values.clear
+          end
+          relation._select!(-> { aliases.columns })
+        end
+      end
+    end
+  end
+end

data/lib/forest_liana/engine.rb

@@ -7,6 +7,7 @@ require 'jwt'
 require 'bcrypt'
 require_relative 'bootstrapper'
 require_relative 'collection'
+require_relative 'active_record_override'
 
 module Rack
   class Cors
@@ -90,6 +91,12 @@ module ForestLiana
       end
     end
 
+    initializer 'forest_liana.override_active_record_dependency' do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Associations::JoinDependency.prepend(ForestLiana::ActiveRecordOverride::Associations::JoinDependency)
+      end
+    end
+
     config.after_initialize do |app|
       if error
         FOREST_REPORTER.report error

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.11.3"
+  VERSION = "9.12.0"
 end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -4,7 +4,7 @@ module ForestLiana
     let(:pageSize) { 10 }
     let(:pageNumber) { 1 }
     let(:sort) { 'id' }
-    let(:fields) {}
+    let(:fields) { { resource.name => 'id' } }
     let(:filters) {}
     let(:scopes) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
     let(:rendering_id) { 13 }
@@ -190,6 +190,7 @@ module ForestLiana
 
     describe 'when on a model having a reserved SQL word as name' do
       let(:resource) { Reference }
+      let(:fields) { { resource.name => 'id' } }
 
       it 'should get the ressource properly' do
         getter.perform
@@ -219,6 +220,7 @@ module ForestLiana
 
     describe 'when sorting by a belongs_to association' do
       let(:resource) { Tree }
+      let(:fields) { { resource.name => 'id' } }
       let(:sort) { 'owner.name' }
 
       it 'should get only the expected records' do
@@ -501,7 +503,7 @@ module ForestLiana
     describe 'when scopes are defined' do
       let(:resource) { Island }
       let(:pageSize) { 15 }
-      let(:fields) { }
+      let(:fields) { { resource.name => 'id' } }
       let(:filters) { }
       let(:scopes) {
         {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.11.3
+  version: 9.12.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -317,6 +317,7 @@ files:
 - config/routes.rb
 - config/routes/actions.rb
 - lib/forest_liana.rb
+- lib/forest_liana/active_record_override.rb
 - lib/forest_liana/base64_string_io.rb
 - lib/forest_liana/bootstrapper.rb
 - lib/forest_liana/collection.rb