jit_preloader 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d42276971ec067b0aafaf2252e62e7a8f974525
-  data.tar.gz: 5c2cc5de28be5ebedc033d704971937dcd9904d9
+SHA256:
+  metadata.gz: e859fc3b5826b985e1b51721bb6d05dc215b2434b250e553f85606ffba196ce3
+  data.tar.gz: d3637cf1b4cf27da79db1ad6dea4be978d9091ae96278abc2cbd02d5c2256076
 SHA512:
-  metadata.gz: 71cfe85e0ca02afa0632b7efcf4991ca3778fa0870bb4773c1f789ff18bb21e9d50d08b5d2bffb9590c660480bc2e57061fce6e97d5553d586b9bdfd2108a5e6
-  data.tar.gz: 23828f4c2da51cbfb4e8e5f4026472875d29119005045d4d720908380811b0662aa0ca013e38af3a52accc8d08233ac358a2d92437184426645209a558479125
+  metadata.gz: a2d6a3f714be0c14a0f026d4b824f0c4f2176818af5338e94af11f5fe83af41b81181368e32ea42ad0cf00b5a78de598fd8010b77afe36b8ee01745ac9dca236
+  data.tar.gz: fc80b435fa33b15f6686ca061943f050497f6485edd4b63d0a7c505403cfb8fe6019b85615f195b6d6b02fd09cf325970f93e1b3e8c7503bd42ec37f1df5f2c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jit_preloader (0.2.0)
+    jit_preloader (0.2.1)
       activerecord (> 4.2, < 6)
       activesupport
 

data/lib/jit_preloader/active_record/base.rb

@@ -38,20 +38,25 @@ module JitPreloadExtension
           primary_ids = jit_preloader.records.collect{|r| r[reflection.active_record_primary_key] }
           klass = reflection.klass
 
-          association_scope = klass
-          association_scope = association_scope.instance_exec(&reflection.scope).reorder(nil) if reflection.scope
+          aggregate_association = reflection
+          while aggregate_association.through_reflection
+            aggregate_association = aggregate_association.through_reflection
+          end
 
-          conditions[reflection.foreign_key] = primary_ids
+          association_scope = klass.all.merge(association(assoc).scope).unscope(where: aggregate_association.foreign_key)
+          association_scope = association_scope.instance_exec(&reflection.scope).reorder(nil) if reflection.scope
 
+          conditions[aggregate_association.table_name] = { aggregate_association.foreign_key => primary_ids }
           if reflection.type.present?
             conditions[reflection.type] = self.class.name
           end
+          group_by = "#{aggregate_association.table_name}.#{aggregate_association.foreign_key}"
 
           preloaded_data = Hash[association_scope
-                                 .where(conditions)
-                                 .group(reflection.foreign_key)
-                                 .send(aggregate, field)
-                               ]
+            .where(conditions)
+            .group(group_by)
+            .send(aggregate, field)
+          ]
 
           jit_preloader.records.each do |record|
             record.jit_preload_aggregates ||= {}

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/lib/jit_preloader/preloader_spec.rb

@@ -85,6 +85,111 @@ RSpec.describe JitPreloader::Preloader do
     end
   end
 
+  context "when preloading an aggregate on a has_many through relationship" do
+    let(:country_contacts_counts) { [2, 3] }
+
+    context "without jit preload" do
+      it "generates N+1 query notifications for each one" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          Country.all.each_with_index do |c, i|
+            expect(c.contacts_count).to eql country_contacts_counts[i]
+          end
+        end
+
+        country_contact_queries = [canada, usa].product([["contacts.count"]])
+        expect(source_map).to eql(Hash[country_contact_queries])
+      end
+    end
+
+    context "with jit_preload" do
+      it "does NOT generate N+1 query notifications" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          Country.all.jit_preload.each_with_index do |c, i|
+            expect(c.contacts_count).to eql country_contacts_counts[i]
+          end
+        end
+
+        expect(source_map).to eql({})
+      end
+
+      it "can handle queries" do
+        Country.all.jit_preload.each_with_index do |c, i|
+          expect(c.contacts_count).to eql country_contacts_counts[i]
+        end
+      end
+    end
+  end
+
+  context "when preloading an aggregate on a polymorphic has_many through relationship" do
+    let(:contact_owner_addresses_counts) { [3] }
+
+    context "without jit preload" do
+      it "generates N+1 query notifications for each one" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          ContactOwner.all.each_with_index do |c, i|
+            expect(c.addresses_count).to eql contact_owner_addresses_counts[i]
+          end
+        end
+
+        contact_owner_addresses_queries = [contact_owner].product([["addresses.count"]])
+        expect(source_map).to eql(Hash[contact_owner_addresses_queries])
+      end
+    end
+
+    context "with jit_preload" do
+      it "does NOT generate N+1 query notifications" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          ContactOwner.all.jit_preload.each_with_index do |c, i|
+            expect(c.addresses_count).to eql contact_owner_addresses_counts[i]
+          end
+        end
+
+        expect(source_map).to eql({})
+      end
+
+      it "can handle queries" do
+        ContactOwner.all.jit_preload.each_with_index do |c, i|
+          expect(c.addresses_count).to eql contact_owner_addresses_counts[i]
+        end
+      end
+    end
+  end
+
+  context "when preloading a has_many through polymorphic aggregate where the through class has a polymorphic relationship to the target class" do
+    let(:contact_owner_counts) { [1, 2] }
+
+    context "without jit preload" do
+      it "generates N+1 query notifications for each one" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          Country.all.each_with_index do |c, i|
+            expect(c.contact_owners_count).to eql contact_owner_counts[i]
+          end
+        end
+
+        contact_owner_queries = [canada, usa].product([["contact_owners.count"]])
+        expect(source_map).to eql(Hash[contact_owner_queries])
+      end
+    end
+
+    context "with jit_preload" do
+      it "does NOT generate N+1 query notifications" do
+        ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
+          Country.all.jit_preload.each_with_index do |c, i|
+            expect(c.contact_owners_count).to eql contact_owner_counts[i]
+          end
+        end
+
+        expect(source_map).to eql({})
+      end
+
+      it "can handle queries" do
+        Country.all.jit_preload.each_with_index do |c, i|
+          expect(c.contact_owners_count).to eql contact_owner_counts[i]
+        end
+      end
+    end
+  end
+
   context "when preloading an aggregate" do
     let(:addresses_counts) { [3, 0, 2] }
     let(:phone_number_counts) { [2, 0, 1] }

data/spec/support/models.rb

@@ -5,7 +5,6 @@ class Contact < ActiveRecord::Base
   has_many :phone_numbers
   has_one :email_address
 
-
   has_many_aggregate :addresses, :max_street_length, :maximum, "LENGTH(street)"
   has_many_aggregate :phone_numbers, :count, :count, "id"
   has_many_aggregate :addresses, :count, :count, "*"
@@ -26,9 +25,17 @@ end
 
 class Country < ActiveRecord::Base
   has_many :addresses
+  has_many :contacts, through: :addresses
+  has_many :contact_owners, through: :contacts, source_type: 'ContactOwner'
+
+  has_many_aggregate :contacts, :count, :count, "*"
+  has_many_aggregate :contact_owners, :count, :count, "*"
 end
 
 class ContactOwner < ActiveRecord::Base
   has_many :contacts, as: :contact_owner
+  has_many :addresses, through: :contacts
+
   has_many_aggregate :contacts, :count, :count, "*"
+  has_many_aggregate :addresses, :count, :count, "*"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -179,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Tool to understand N+1 queries and to remove them