fix NPlusOneQuery.call_association in AR4 empty? hack

flyerhzm · Nov 5, 2023 · 2282b01 · 2282b01
1 parent 6beb6cb
commit 2282b01
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/bullet/active_record4.rb b/lib/bullet/active_record4.rb
@@ -147,7 +147,9 @@ def empty?
       ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start? && !loaded?
+          if Bullet.start? && !has_cached_counter?(@reflection)
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_empty?
         end
       end