bullet 8.1.1 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f10d7c7ed8bf9cb6e6b3f0d8d2757bfa71a66d8c4f90da0ce708cfce06eddb8
-  data.tar.gz: 4986e5b6390339bd6034a598a5f24678dd98c1db907f07de3a2aac1cef4501fd
+  metadata.gz: ebbf526d81da50f5e04ae03c0e33af01ab71071747711f62dd3790a6debc0551
+  data.tar.gz: 7a1551a54344f9c363402854bf8129bc58ec21927b1ee9a9ce2f0b6a5b8f3e16
 SHA512:
-  metadata.gz: 323f11d8aee1ba3175eb02795aafb800ad1262f4da84333698fa2f73011b5f9912ad7c38fe37f347ac1b492e90cff87db322433fc6ef55262ab1ecf2e6cc02d7
-  data.tar.gz: e44277b7412ff505bb3c21047f8eeff5774f367375989192ef27367102eae91f04eb6625f89110160181690ab440051ae6dc2db39d0b5eb89b30fe47a164eab9
+  metadata.gz: 5b24c5aea3986b30399e0456268bdb00462540324b745aa4ccc451f77b0e4d78222fec5c4fb781b72114f5f497c12069ad5daf3b3678ae674ae7c58d688d824a
+  data.tar.gz: 449c1c448f20f778053ec7ea032956f7446c2a14c1ea11293f3bc13cf7cf0d794beecf46dfb8052d58c644f35679a5d671f7def8b6d3b6f8eafd0a4689f7b565

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Unreleased
+
+## 8.1.3 (06/02/2026)
+
+* Handle inversed polymorphic belongs_to false positives
+
+## 8.1.2 (05/25/2026)
+
+* Skip N+1 detection for optional polymorphic `belongs_to` whose `*_type` column is nil. ActiveRecord short-circuits the reader to nil without issuing SQL, so the access cannot represent an N+1 query and preloading would be a no-op.
+* Fix `Set#<<` corruption in `UnusedEagerLoading#add_eager_loadings` split branch
+
 ## 8.1.1 (04/23/2026)
 
 * Fix ActiveRecord 8.1 patch-level method signature compatibility; test against Rails 8.1.3.

data/README.md

@@ -259,6 +259,8 @@ config.after_initialize do
 end
 ```
 
+**Note:** Controller and integration tests work automatically because Bullet's Rack middleware wraps each HTTP request with `Bullet.start_request` and `Bullet.end_request`. However, model tests and other tests that don't go through the Rack middleware (like direct model method calls) require manual wrapping with the test helper code below.
+
 Then wrap each test in the Bullet api.
 
 With RSpec:

data/lib/bullet/active_record4.rb

@@ -166,10 +166,8 @@ module Bullet
         def reader(force_reload = false)
           result = origin_reader(force_reload)
           if Bullet.start?
-            unless @inversed
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-              Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
-            end
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(result) unless @inversed
           end
           result
         end

data/lib/bullet/active_record41.rb

@@ -134,7 +134,7 @@ module Bullet
         # call one to many associations
         alias_method :origin_load_target, :load_target
         def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start? && !@inversed
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed) if Bullet.start?
           origin_load_target
         end
 
@@ -159,9 +159,9 @@ module Bullet
         def reader(force_reload = false)
           result = origin_reader(force_reload)
           if Bullet.start?
-            if @owner.class.name !~ /^HABTM_/ && !@inversed
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-              Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+            if @owner.class.name !~ /^HABTM_/
+              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(result) unless @inversed
             end
           end
           result

data/lib/bullet/active_record42.rb

@@ -179,7 +179,7 @@ module Bullet
           records = origin_load_target
 
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
             if records.first.class.name !~ /^HABTM_/
               if records.size > 1
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -215,13 +215,14 @@ module Bullet
           result = origin_reader(force_reload)
 
           if Bullet.start?
-            if @owner.class.name !~ /^HABTM_/ && !@inversed
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-
-              if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-              else
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+            if @owner.class.name !~ /^HABTM_/
+              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
+              unless @inversed
+                if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                else
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                end
               end
             end
           end

data/lib/bullet/active_record5.rb

@@ -202,7 +202,7 @@ module Bullet
                   end
                 end
               end
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
               if records.first.class.name !~ /^HABTM_/
                 if records.size > 1
                   Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -237,13 +237,14 @@ module Bullet
             result = super()
 
             if Bullet.start?
-              if owner.class.name !~ /^HABTM_/ && !@inversed
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-
-                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-                else
-                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+              if owner.class.name !~ /^HABTM_/
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
+                unless @inversed
+                  if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                    Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                  else
+                    Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                  end
                 end
               end
             end

data/lib/bullet/active_record52.rb

@@ -173,7 +173,7 @@ module Bullet
                   end
                 end
               end
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
               if records.first.class.name !~ /^HABTM_/
                 if records.size > 1
                   Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -208,24 +208,27 @@ module Bullet
             result = super()
 
             if Bullet.start?
-              if owner.class.name !~ /^HABTM_/ && !@inversed
-                if is_a? ::ActiveRecord::Associations::ThroughAssociation
-                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
-                  association = owner.association reflection.through_reflection.name
-                  Array.wrap(association.target).each do |through_record|
-                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
-                  end
+              if owner.class.name !~ /^HABTM_/
+                unless @inversed
+                  if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                    association = owner.association reflection.through_reflection.name
+                    Array.wrap(association.target).each do |through_record|
+                      Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                    end
 
-                  if reflection.through_reflection != through_reflection
-                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    if reflection.through_reflection != through_reflection
+                      Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    end
                   end
                 end
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-
-                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-                else
-                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
+                unless @inversed
+                  if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                    Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                  else
+                    Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                  end
                 end
               end
             end

data/lib/bullet/active_record60.rb

@@ -200,7 +200,11 @@ module Bullet
                   end
                 end
               end
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+              if @inversed
+                Bullet::Detector::Association.add_call_object_associations(owner, reflection.name)
+              else
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              end
               if records.first.class.name !~ /^HABTM_/
                 if records.size > 1
                   Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -235,24 +239,27 @@ module Bullet
             result = super()
 
             if Bullet.start?
-              if owner.class.name !~ /^HABTM_/ && !@inversed
-                if is_a? ::ActiveRecord::Associations::ThroughAssociation
-                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
-                  association = owner.association(reflection.through_reflection.name)
-                  Array.wrap(association.target).each do |through_record|
-                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
-                  end
+              if owner.class.name !~ /^HABTM_/
+                unless @inversed
+                  if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                    association = owner.association(reflection.through_reflection.name)
+                    Array.wrap(association.target).each do |through_record|
+                      Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                    end
 
-                  if reflection.through_reflection != through_reflection
-                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    if reflection.through_reflection != through_reflection
+                      Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    end
                   end
                 end
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-
-                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-                else
-                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
+                unless @inversed
+                  if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                    Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                  else
+                    Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                  end
                 end
               end
             end

data/lib/bullet/active_record61.rb

@@ -200,7 +200,11 @@ module Bullet
                   end
                 end
               end
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+              if @inversed
+                Bullet::Detector::Association.add_call_object_associations(owner, reflection.name)
+              else
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              end
               if records.first.class.name !~ /^HABTM_/
                 if records.size > 1
                   Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -235,24 +239,27 @@ module Bullet
             result = super()
 
             if Bullet.start?
-              if owner.class.name !~ /^HABTM_/ && !@inversed
-                if is_a? ::ActiveRecord::Associations::ThroughAssociation
-                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
-                  association = owner.association(reflection.through_reflection.name)
-                  Array.wrap(association.target).each do |through_record|
-                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
-                  end
+              if owner.class.name !~ /^HABTM_/
+                unless @inversed
+                  if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                    association = owner.association(reflection.through_reflection.name)
+                    Array.wrap(association.target).each do |through_record|
+                      Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                    end
 
-                  if reflection.through_reflection != through_reflection
-                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    if reflection.through_reflection != through_reflection
+                      Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                    end
                   end
                 end
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-
-                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-                else
-                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
+                unless @inversed
+                  if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                    Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                  else
+                    Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                  end
                 end
               end
             end

data/lib/bullet/detector/n_plus_one_query.rb

@@ -13,15 +13,20 @@ module Bullet
         # first, it keeps this method call for object.association.
         # then, it checks if this associations call is unpreload.
         #   if it is, keeps this unpreload associations and caller.
-        def call_association(object, associations, caller_stack = nil)
+        def call_association(object, associations, caller_stack = nil, inversed: false)
           return unless Bullet.start?
           return unless Bullet.n_plus_one_query_enable?
           return unless object.bullet_primary_key_value
-          return if inversed_objects.include?(object.bullet_key, associations)
 
+          # Record before early-returns so legitimate reads that bypass SQL
+          # (inversed, nil-polymorphic) aren't flagged as unused preloads.
           add_call_object_associations(object, associations)
           call_stacks.add(object.bullet_key, caller_stack) if caller_stack
 
+          return if inversed
+          return if inversed_objects.include?(object.bullet_key, associations)
+          return if optional_polymorphic_belongs_to_with_nil_type?(object, associations)
+
           Bullet.debug(
             'Detector::NPlusOneQuery#call_association',
             "object: #{object.bullet_key}, associations: #{associations}"
@@ -116,6 +121,19 @@ module Bullet
 
         private
 
+        def optional_polymorphic_belongs_to_with_nil_type?(object, associations)
+          return false unless associations.is_a?(Symbol) || associations.is_a?(String)
+          return false unless object.class.respond_to?(:reflect_on_association)
+
+          reflection = object.class.reflect_on_association(associations.to_sym)
+          return false unless reflection
+          return false unless reflection.respond_to?(:polymorphic?) && reflection.polymorphic?
+          return false unless reflection.respond_to?(:foreign_type)
+
+          foreign_type = reflection.foreign_type
+          foreign_type && object.respond_to?(:[]) && object[foreign_type].nil?
+        end
+
         def create_notification(callers, klazz, associations)
           notify_associations = Array.wrap(associations) - Bullet.get_safelist_associations(:n_plus_one_query, klazz)
 

data/lib/bullet/detector/unused_eager_loading.rb

@@ -50,7 +50,7 @@ module Bullet
             if key_objects_overlap == k
               to_add << [k, associations]
             else
-              to_merge << [key_objects_overlap, (eager_loadings[k].dup << associations)]
+              to_merge << [key_objects_overlap, eager_loadings[k].dup.merge(Array.wrap(associations))]
 
               keys_without_objects = k - key_objects_overlap
               to_merge << [keys_without_objects, eager_loadings[k]]

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '8.1.1'
+  VERSION = '8.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Richard Huang
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files: []