forest_admin_datasource_active_record 1.0.0.pre.beta.97 → 1.0.0.pre.beta.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b38a52aa95adb40477a63cc126e1c0ca9b64deac752faab651dc41b48e7589
-  data.tar.gz: 99517b7674002b976f641b980c8f132a0f11dd98f5cb05ce4e350ba409201c25
+  metadata.gz: 4f2d336f05552e180ef83b936bebef7078273ec484b4a8e915da2b4c4becf131
+  data.tar.gz: b01560dddb4f847b82059714dee9cf9c437be87491e4195a85d69ff9f2091fa9
 SHA512:
-  metadata.gz: bba918fc280643db5e5ae2f85ba4c07524e14aeac607fe3af60509ef01637190859f63c7a7edb2cfbafe124d859a937c08a8c0b1bac64397be11179967b54a4d
-  data.tar.gz: be1c7702d6830c94e7370e437270b495130989a147fb874a95562f598a309adcb609e3f687bfc29ffc07f4fc15f1cb48b458c471442b8089989a99a54b4f3d41
+  metadata.gz: 44d467306a01e9a5ea0c70a59c035ff253df538198457a28c3e91ea858b0071d1bb8b9e80b62a849a5bbb554562373c40f75736d1951c279dd417102a5674407
+  data.tar.gz: 7b949b1b0d229f02472ee7c40ec1a2a91c0d63a6f788ea7a445c2ffbcaaff83535df9e5ccb4035a1011adf632cb43d2ef53ef9cf8be2a22053fd9340d6a4120e

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -3,7 +3,7 @@ module ForestAdminDatasourceActiveRecord
     class Query
       include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
 
-      attr_reader :query
+      attr_reader :query, :select
 
       def initialize(collection, projection, filter)
         @collection = collection
@@ -15,7 +15,7 @@ module ForestAdminDatasourceActiveRecord
       end
 
       def build
-        build_select
+        build_select(@collection, @projection)
         apply_filter
         apply_select
       end
@@ -92,20 +92,26 @@ module ForestAdminDatasourceActiveRecord
         @query
       end
 
-      def build_select
-        unless @projection.nil?
-          @select += @projection.columns.map { |field| "#{@collection.model.table_name}.#{field}" }
-          @projection.relations.each_key do |relation|
-            relation_schema = @collection.schema[:fields][relation]
-            @select << if ['OneToOne', 'PolymorphicOneToOne'].include?(relation_schema.type)
-                         "#{@collection.model.table_name}.#{relation_schema.origin_key_target}"
+      def build_select(collection, projection)
+        return if projection.nil?
+
+        if collection.model.table_name == @collection.model.table_name
+          @select += projection.columns.map { |field| "#{collection.model.table_name}.#{field}" }
+        end
+
+        one_to_one_relations = %w[OneToOne PolymorphicOneToOne]
+        projection.relations.each do |relation_name, sub_projection|
+          relation_schema = collection.schema[:fields][relation_name]
+          if collection.model.table_name == @collection.model.table_name
+            @select << if one_to_one_relations.include?(relation_schema.type)
+                         "#{collection.model.table_name}.#{relation_schema.origin_key_target}"
                        else
-                         "#{@collection.model.table_name}.#{relation_schema.foreign_key}"
+                         "#{collection.model.table_name}.#{relation_schema.foreign_key}"
                        end
           end
-        end
 
-        @query
+          build_select(collection.datasource.get_collection(relation_schema.foreign_collection), sub_projection)
+        end
       end
 
       def apply_select
@@ -149,6 +155,7 @@ module ForestAdminDatasourceActiveRecord
 
           result[relation.to_sym] = formatted_relations
         end
+
         result
       end
     end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.97"
+  VERSION = "1.0.0-beta.98"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.97
+  version: 1.0.0.pre.beta.98
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord