1 files changed, 11 insertions, 3 deletions
diff --git a/spec/support/query_recorder.rb b/spec/support/query_recorder.rb
index e40d5ebd9a8..55b531b4cf7 100644
--- a/spec/support/query_recorder.rb
+++ b/spec/support/query_recorder.rb
@@ -1,21 +1,29 @@
 module ActiveRecord
   class QueryRecorder
-    attr_reader :log
+    attr_reader :log, :cached
 
     def initialize(&block)
       @log = []
+      @cached = []
       ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
     end
 
     def callback(name, start, finish, message_id, values)
-      return if %w(CACHE SCHEMA).include?(values[:name])
-      @log << values[:sql]
+      if values[:name]&.include?("CACHE")
+        @cached << values[:sql]
+      elsif !values[:name]&.include?("SCHEMA")
+        @log << values[:sql]
+      end
     end
 
     def count
       @log.count
     end
 
+    def cached_count
+      @cached.count
+    end
+
     def log_message
       @log.join("\n\n")
     end