eager_group 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516b00c6397d1a6b397b165687091079118a48ed39fc0afce4542d3cf4f7f481
-  data.tar.gz: 9bf3083695c819003574f3971d2a592443320af92dc98c1ff36b302c87718889
+  metadata.gz: 88912c5696afe9332d53ac15b2365d2e2d7112391672a2cba5db62012876a138
+  data.tar.gz: a18a2d21cd4299a68774f3dbb62556c71f3096b3ebac28bebf7a767a875fc00f
 SHA512:
-  metadata.gz: 389265b557184c2d3f3c0207340c8bd65086a38fb8e0b2b168a4c14ed37f82b5bcb0ee89ab7a48da528bfbcf2174c1c89dcc0fd917eade1de9c184cad3238e9b
-  data.tar.gz: 6e5e9bd946a9d333bda2087578ac47b98d57ab0cb8347adc9577f582124e1ca9a571fdddeaa28da48644aca0f9d0546f1ee323149742b2c0868d5d6c324354da
+  metadata.gz: af269ea9b3be9f9a613f56cf14e52a7b183b6d041583f02aa88945f65150f98147ed7271523b9f8ec0d36c622f42ae257f7137e9cf842b381f11cbd7cd6e50bf
+  data.tar.gz: 2878aaefb0b9420b13531927cd46ad47894954c2999fe81d9bf853d7f2255ae97b42df8e56c43a840b5812d71ed1f535c391ccf605fbed99f08ed0769959eab8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 0.8.1 (10/25/2019)
+
+* Fix for `has_many :through`
+
 ## 0.8.0 (10/21/2019)
 
 * Support `has_and_belongs_to_many`

data/lib/eager_group/preloader.rb

@@ -31,28 +31,18 @@ module EagerGroup
         association_class = reflection.klass
         association_class = association_class.instance_exec(*arguments, &definition.scope) if definition.scope
 
-        if reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
-          foreign_key = "#{reflection.join_table}.#{reflection.foreign_key}"
-          aggregate_hash =
-            @klass.joins(reflection.name).where(foreign_key => record_ids).where(
-              polymophic_as_condition(reflection)
-            )
-              .group(foreign_key)
-              .send(definition.aggregation_function, definition.column_name)
-        elsif reflection.through_reflection
-          foreign_key = "#{reflection.through_reflection.name}.#{reflection.through_reflection.foreign_key}"
-          aggregate_hash =
-            association_class.joins(reflection.through_reflection.name).where(foreign_key => record_ids).where(
-              polymophic_as_condition(reflection.through_reflection)
-            )
-              .group(foreign_key)
-              .send(definition.aggregation_function, definition.column_name)
-        else
-          aggregate_hash =
-            association_class.where(reflection.foreign_key => record_ids).where(polymophic_as_condition(reflection))
-              .group(reflection.foreign_key)
-              .send(definition.aggregation_function, definition.column_name)
-        end
+        foreign_key, aggregate_hash =
+          if reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
+            ["#{reflection.join_table}.#{reflection.foreign_key}", @klass.joins(reflection.name)]
+          elsif reflection.through_reflection
+            ["#{reflection.through_reflection.name}.#{reflection.through_reflection.foreign_key}", @klass.joins(reflection.name)]
+          else
+            [reflection.foreign_key, association_class]
+          end
+        aggregate_hash = aggregate_hash.where(foreign_key => record_ids)
+                                       .where(polymophic_as_condition(reflection))
+                                       .group(foreign_key)
+                                       .send(definition.aggregation_function, definition.column_name)
         if definition.need_load_object
           aggregate_objects = reflection.klass.find(aggregate_hash.values).each_with_object({}) { |o, h| h[o.id] = o }
           aggregate_hash.keys.each { |key| aggregate_hash[key] = aggregate_objects[aggregate_hash[key]] }

data/lib/eager_group/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EagerGroup
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord