eager_group 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516b00c6397d1a6b397b165687091079118a48ed39fc0afce4542d3cf4f7f481
-  data.tar.gz: 9bf3083695c819003574f3971d2a592443320af92dc98c1ff36b302c87718889
+  metadata.gz: 5370e57578e725513b391777f1a86e3b1d7560bc596a08b005110d3220d43325
+  data.tar.gz: b4987065f8781190983f2b92a84db5ea7e248f43290763ba483d52ec472cb1e8
 SHA512:
-  metadata.gz: 389265b557184c2d3f3c0207340c8bd65086a38fb8e0b2b168a4c14ed37f82b5bcb0ee89ab7a48da528bfbcf2174c1c89dcc0fd917eade1de9c184cad3238e9b
-  data.tar.gz: 6e5e9bd946a9d333bda2087578ac47b98d57ab0cb8347adc9577f582124e1ca9a571fdddeaa28da48644aca0f9d0546f1ee323149742b2c0868d5d6c324354da
+  metadata.gz: 172290ed5e79c34139cdc35976f22e612e225e39f6b417f07f86696970f28969f058c59189e683d9ca299d5d61643dbdbf8220648889f7e4bbcb66cb30f68d7e
+  data.tar.gz: 91577037162ebb062b8939c02fc2aa66e4fdf1e891fb6e20ffd199d7e80879c38f20ae4fc4cc95ae32c7f16ab90377816ed42dc215dd0cd92fad9ce01f9450ea

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Next Release
 
+## 0.8.2 (09/22/2022)
+
+* Add MIT-LICENSE
+
+## 0.8.1 (10/25/2019)
+
+* Fix for `has_many :through`
+
 ## 0.8.0 (10/21/2019)
 
 * Support `has_and_belongs_to_many`

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2015 - 2022 Richard Huang (flyerhzm@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/eager_group/preloader.rb

@@ -31,28 +31,20 @@ 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.2'
 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.2
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -134,6 +134,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - benchmark.rb
@@ -149,7 +150,7 @@ homepage: https://github.com/flyerhzm/eager_group
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Fix n+1 aggregate sql functions
 test_files: []