bullet 8.1.1 → 8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f10d7c7ed8bf9cb6e6b3f0d8d2757bfa71a66d8c4f90da0ce708cfce06eddb8
-  data.tar.gz: 4986e5b6390339bd6034a598a5f24678dd98c1db907f07de3a2aac1cef4501fd
+  metadata.gz: 42ddb49df9a6b4d4176a38561476cda975818bf5861606b4c279af59378a6b1e
+  data.tar.gz: 8ae04173fe4f709c39f3a2011403b42617eb91d10de4f25eb29a2a28d06419c3
 SHA512:
-  metadata.gz: 323f11d8aee1ba3175eb02795aafb800ad1262f4da84333698fa2f73011b5f9912ad7c38fe37f347ac1b492e90cff87db322433fc6ef55262ab1ecf2e6cc02d7
-  data.tar.gz: e44277b7412ff505bb3c21047f8eeff5774f367375989192ef27367102eae91f04eb6625f89110160181690ab440051ae6dc2db39d0b5eb89b30fe47a164eab9
+  metadata.gz: 990f264d654fb565f413d015aadc0b5dd85ff418f881edf6ca9a50bd8df0a228d101cc7f92c3c2d868eff3c23cbfda3e1fbec554cb05cdb0a275133b984f5ee2
+  data.tar.gz: 9f6e68da52ba03e7e434c879baa886d054f18ed5fb0b27606a79094c055f6da0d84702b319c5108812ca71eea94da6d07f07f92dcce31fac889be3858e91a7aa

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+## 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/detector/n_plus_one_query.rb

@@ -19,6 +19,15 @@ module Bullet
           return unless object.bullet_primary_key_value
           return if inversed_objects.include?(object.bullet_key, associations)
 
+          # AR short-circuits a polymorphic belongs_to read to nil when the
+          # *_type column is nil — no SQL is issued, so this cannot be an N+1.
+          # Still record the call so a present preload isn't flagged as unused.
+          if optional_polymorphic_belongs_to_with_nil_type?(object, associations)
+            add_call_object_associations(object, associations)
+            call_stacks.add(object.bullet_key, caller_stack) if caller_stack
+            return
+          end
+
           add_call_object_associations(object, associations)
           call_stacks.add(object.bullet_key, caller_stack) if caller_stack
 
@@ -116,6 +125,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.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.2
 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: []