graphql-association_batch_resolver 0.1.1 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d358169832729efb0321f747663d77a5f0a6b508245b9d31f717925fb2a6a1
-  data.tar.gz: 5b051213e91cc212f7a8591088267f3f3b3004dce5c3384680ce6b96d759c2a4
+  metadata.gz: 81c7c496fd558d2f36960ae703d3b785a59a843bfde46fbc8cd286a82c47a7e1
+  data.tar.gz: eeacd401c91ea7cc795d9d02d362a16d8eb07ed8f4a86e9096a0a23383fda773
 SHA512:
-  metadata.gz: 9b197fd21cc259e2950200fcb1325146306991af9b30d37e4664d43fd4569ba8157c1f63d49ac25086afdde3d4f36a92503d4f28780748fca44cde1cedb2d59d
-  data.tar.gz: c33f52fb4ca9e34c06416769708df019abf413456d83ad6c9711864a64db228934d76eca6f29311a83216d1dd1bd8f662ac3abf8d340e28f3c2bf4d903954b1c
+  metadata.gz: a0cb7ca2b4d67e15f175578bbe21ed20a57f1548eb7b2adc379606069950ac281b0293a77587696c84531a512f29ca7e44106186451c5d659935290c933ba044
+  data.tar.gz: 100dbcdc2189b2d55a17386ddcff89fc2410337a080335b4fcf2a377555b0211e0418ac97ff9f04a83151a2a4a777003b1b6b1fe5ea5b46b26c1672ed9db0f21

data/lib/graphql/association_batch_resolver/association_loader.rb

@@ -49,30 +49,35 @@ module GraphQL
         raise ArgumentError, "No association #{association_name} on #{model}" unless association_exists
       end
 
-      # rubocop:disable Metrics/AbcSize
       def preload_association(records)
-        select_model_primary_keys = ColumnAggregator.aggregate([model.arel_table[model_primary_key]])
-
-        association_records = model.where(model_primary_key => records)
-                                   .joins(association_name)
-                                   .select(association_model.arel_table[Arel.star])
-                                   .select(select_model_primary_keys.as('model_primary_keys'))
-                                   .group(association_model.arel_table[association_primary_key])
-
+        association_records = associations_for(records)
         association_records = options[:scope].call(association_records, context) if options[:scope].respond_to?(:call)
+        find_by_sql = association_records.to_sql
 
-        # .merge(Pundit.policy_scope!(context[:user], association.klass))
-
-        self.scope = association_model.find_by_sql(association_records.to_sql).to_a
+        self.scope = if find_by_sql.present?
+                       association_model.find_by_sql(find_by_sql).to_a
+                     else
+                       []
+                     end
       end
 
+      # rubocop:disable Metrics/AbcSize
+      def associations_for(records)
+        select_model_primary_keys = ColumnAggregator.aggregate([model.arel_table[model_primary_key]])
+        self.scope = model.where(model_primary_key => records)
+                          .joins(association_name)
+                          .select(association_model.arel_table[Arel.star])
+                          .select(select_model_primary_keys.as('model_primary_keys'))
+                          .group(association_model.arel_table[association_primary_key])
+      end
       # rubocop:enable Metrics/AbcSize
 
       def read_association(model_record)
         key = model_record.send(model_primary_key)
 
+        type = model.type_for_attribute(model_primary_key)
         association_scope = scope.select do |association_record|
-          ColumnAggregator.deserialize(association_record.model_primary_keys).include?(key.to_s)
+          ColumnAggregator.deserialize(association_record.model_primary_keys, type).include?(key)
         end
 
         is_collection ? association_scope : association_scope.first

data/lib/graphql/association_batch_resolver/association_resolver.rb

@@ -34,7 +34,7 @@ module GraphQL
       def initialize(*args, loader_class: GraphQL::AssociationBatchResolver.configuration.loader, **keywargs, &block)
         super(*args, **keywargs, &block)
         initialization_arguments = [model, association]
-        initialization_arguments << options if loader_class.method(:new).arity == 3
+        initialization_arguments << options if options
 
         @loader = loader_class.for(*initialization_arguments)
         @loader.context = context if @loader.respond_to?(:context=)

data/lib/graphql/association_batch_resolver/column_aggregator.rb

@@ -10,8 +10,8 @@ module GraphQL
         adapter.aggregate(expression)
       end
 
-      def self.deserialize(column)
-        adapter.deserialize(column)
+      def self.deserialize(column, type)
+        adapter.deserialize(column, type)
       end
 
       def self.adapter

data/lib/graphql/association_batch_resolver/column_aggregators/mysql_column_aggregator.rb

@@ -7,8 +7,8 @@ module GraphQL
         Arel::Nodes::NamedFunction.new('GROUP_CONCAT', expression)
       end
 
-      def self.deserialize(column)
-        column.split(',')
+      def self.deserialize(column, type)
+        column.split(',').map(&type.method(:deserialize))
       end
     end
   end

data/lib/graphql/association_batch_resolver/column_aggregators/postgres_column_aggregator.rb

@@ -7,7 +7,7 @@ module GraphQL
         Arel::Nodes::NamedFunction.new('ARRAY_AGG', expression)
       end
 
-      def self.deserialize(column)
+      def self.deserialize(column, _type)
         column
       end
     end

data/lib/graphql/association_batch_resolver/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module AssociationBatchResolver
-    VERSION = '0.1.1'
+    VERSION = '0.1.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-association_batch_resolver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.11
 platform: ruby
 authors:
 - Andrew Derenge