jit_preloader 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a2439886049ccbcd7845882f8fa47524e500ffc96d8b9620711288853c47c131
-  data.tar.gz: 189adc93418cf777c6eb33617934d92426cfbdc105a05a10c639f9dd387736f8
+SHA1:
+  metadata.gz: c2c802d6683cb058781abe0360bec58b0857c020
+  data.tar.gz: 3576db9546592974cc8383c26fa395b939971876
 SHA512:
-  metadata.gz: 932327300aea76f21906abf912ba85d655fbeb04b6cf940c1c650e21d39a72682d4fb55d529c389897ed7d5b45d9a41cec411a5c7eb932f2216df03b91fef47e
-  data.tar.gz: 591bc82f9d763b963a78d6869da2f6346c7c3d49b044e48d0a12529fd61c94b104c3e0cc8e7e08a8a8fd9f4feee4ce73e66fbc72cf36ef11477852949d012802
+  metadata.gz: 4cf99a2440af7e4ef861cf2a2ea679f6ff3fac90494aab0fddb5722a1712b9611357d03c15d6cf1a1ced43f698231228c276c517b362fb05937f8e3510a7a8e4
+  data.tar.gz: ba29dd13180a27824ce4e1ad1ec88124c1200e6025a5341a88aff891b706cb1f899a6ba6d59c208c2ae042cc8112df0ea9c4fed90b3e2a7b6d428145b39b5f1b

data/README.md

@@ -215,7 +215,7 @@ end
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/jit_preloader/fork )
+1. Fork it ( https://github.com/clio/jit_preloader/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/jit_preloader/active_record/base.rb

@@ -41,11 +41,25 @@ module JitPreloadExtension
             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 the query uses an alias for the association, use that instead of the table name
+            table_alias_name = association_scope.references_values.first
+            table_reference = table_alias_name || aggregate_association.table_name
+
+            conditions[table_reference] = { aggregate_association.foreign_key => primary_ids }
+
+            # If the association is a STI child model, specify its type in the condition so that it
+            # doesn't include results from other child models
+            parent_is_base_class = aggregate_association.klass.superclass.abstract_class? || aggregate_association.klass.superclass == ActiveRecord::Base
+            has_type_column = aggregate_association.klass.column_names.include?(aggregate_association.klass.inheritance_column)
+            is_child_sti_model = !parent_is_base_class && has_type_column
+            if is_child_sti_model
+              conditions[table_reference].merge!({ aggregate_association.klass.inheritance_column => aggregate_association.klass.sti_name })
+            end
+
             if reflection.type.present?
               conditions[reflection.type] = self.class.name
             end
-            group_by = "#{aggregate_association.table_name}.#{aggregate_association.foreign_key}"
+            group_by = "#{table_reference}.#{aggregate_association.foreign_key}"
 
             preloaded_data = Hash[association_scope
               .where(conditions)

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/jit_preloader/preloader_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe JitPreloader::Preloader do
-
   let!(:contact1) do
     addresses = [
       Address.new(street: "123 Fake st", country: canada),
@@ -49,6 +48,66 @@ RSpec.describe JitPreloader::Preloader do
     ->(event, data){ source_map[data[:source]] << data[:association] }
   end
 
+  context "for single table inheritance" do
+    context "when preloading an aggregate for a child model" do
+      let!(:contact_book) { ContactBook.create(name: "The Yellow Pages") }
+      let!(:company1) { Company.create(name: "Company1", contact_book: contact_book) }
+      let!(:company2) { Company.create(name: "Company2", contact_book: contact_book) }
+
+      it "can handle queries" do
+        contact_books = ContactBook.jit_preload.to_a
+        expect(contact_books.first.companies_count).to eq 2
+      end
+    end
+
+    context "when preloading an aggregate of a child model through its base model" do
+      let!(:contact_book) { ContactBook.create(name: "The Yellow Pages") }
+      let!(:contact) { Contact.create(name: "Contact", contact_book: contact_book) }
+      let!(:company1) { Company.create(name: "Company1", contact_book: contact_book) }
+      let!(:company2) { Company.create(name: "Company2", contact_book: contact_book) }
+      let!(:contact_employee1) { Employee.create(name: "Contact Employee1", contact: contact) }
+      let!(:contact_employee2) { Employee.create(name: "Contact Employee2", contact: contact) }
+      let!(:company_employee1) { Employee.create(name: "Company Employee1", contact: company1) }
+      let!(:company_employee2) { Employee.create(name: "Company Employee2", contact: company2) }
+
+      it "can handle queries" do
+        contact_books = ContactBook.jit_preload.to_a
+        expect(contact_books.first.employees_count).to eq 4
+      end
+    end
+
+    context "when preloading an aggregate of a nested child model through another child model" do
+      let!(:contact_book) { ContactBook.create(name: "The Yellow Pages") }
+      let!(:contact) { Contact.create(name: "Contact", contact_book: contact_book) }
+      let!(:company1) { Company.create(name: "Company1", contact_book: contact_book) }
+      let!(:company2) { Company.create(name: "Company2", contact_book: contact_book) }
+      let!(:contact_employee1) { Employee.create(name: "Contact Employee1", contact: contact) }
+      let!(:contact_employee2) { Employee.create(name: "Contact Employee2", contact: contact) }
+      let!(:company_employee1) { Employee.create(name: "Company Employee1", contact: company1) }
+      let!(:company_employee2) { Employee.create(name: "Company Employee2", contact: company2) }
+
+      it "can handle queries" do
+        contact_books = ContactBook.jit_preload.to_a
+        expect(contact_books.first.company_employees_count).to eq 2
+      end
+    end
+
+    context "when preloading an aggregate of a nested child model through a many-to-many relationship with another child model" do
+      let!(:contact_book) { ContactBook.create(name: "The Yellow Pages") }
+      let!(:child1) { Child.create(name: "Child1") }
+      let!(:child2) { Child.create(name: "Child2") }
+      let!(:child3) { Child.create(name: "Child3") }
+      let!(:parent1) { Parent.create(name: "Parent1", contact_book: contact_book, children: [child1, child2]) }
+      let!(:parent2) { Parent.create(name: "Parent2", contact_book: contact_book, children: [child2, child3]) }
+
+      it "can handle queries" do
+        contact_books = ContactBook.jit_preload.to_a
+        expect(contact_books.first.children_count).to eq 4
+        expect(contact_books.first.children).to include(child1, child2, child3)
+      end
+    end
+  end
+
   context "when preloading an aggregate as polymorphic" do
     let(:contact_owner_counts) { [2] }
 

data/spec/support/database.rb

@@ -1,12 +1,14 @@
 class Database
   def self.tables
     [
-      "CREATE TABLE contacts (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255), contact_owner_id INTEGER, contact_owner_type VARCHAR(255))",
+      "CREATE TABLE contact_books (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255))",
+      "CREATE TABLE contacts (id INTEGER NOT NULL PRIMARY KEY, type VARCHAR(255), contact_book_id INTEGER, contact_id INTEGER, name VARCHAR(255), contact_owner_id INTEGER, contact_owner_type VARCHAR(255))",
       "CREATE TABLE contact_owners (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255))",
       "CREATE TABLE addresses (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, country_id INTEGER NOT NULL, street VARCHAR(255))",
       "CREATE TABLE email_addresses (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, address VARCHAR(255))",
       "CREATE TABLE phone_numbers (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, phone VARCHAR(10))",
       "CREATE TABLE countries (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255))",
+      "CREATE TABLE parents_children (id INTEGER NOT NULL PRIMARY KEY, parent_id INTEGER, child_id INTEGER)",
     ]
   end
 

data/spec/support/models.rb

@@ -1,15 +1,55 @@
+class ContactBook < ActiveRecord::Base
+  has_many :contacts
+  has_many :employees, through: :contacts
+
+  has_many :companies
+  has_many :company_employees, through: :companies, source: :employees
+
+  has_many :parents
+  has_many :children, through: :parents
+
+  has_many_aggregate :companies, :count, :count, "*"
+  has_many_aggregate :employees, :count, :count, "*"
+  has_many_aggregate :company_employees, :count, :count, "*"
+  has_many_aggregate :children, :count, :count, "*"
+end
+
 class Contact < ActiveRecord::Base
+  belongs_to :contact_book
   belongs_to :contact_owner, polymorphic: true
 
   has_many :addresses
   has_many :phone_numbers
   has_one :email_address
+  has_many :employees
 
   has_many_aggregate :addresses, :max_street_length, :maximum, "LENGTH(street)"
   has_many_aggregate :phone_numbers, :count, :count, "id"
   has_many_aggregate :addresses, :count, :count, "*"
 end
 
+class Company < Contact
+end
+
+class Employee < Contact
+  belongs_to :contact
+end
+
+class ParentsChild < ActiveRecord::Base
+  belongs_to :parent
+  belongs_to :child
+end
+
+class Parent < Contact
+  has_many :parents_child
+  has_many :children, through: :parents_child
+end
+
+class Child < Contact
+  has_many :parents_child
+  has_many :parents, through: :parents_child
+end
+
 class Address < ActiveRecord::Base
   belongs_to :contact
   belongs_to :country

metadata

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