From 84d35da86c14767c737783cb95dd4624632cc1bd Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 22 Sep 2016 15:00:30 +0200
Subject: Preserve cached queries name in AS notifications

---
 activerecord/test/cases/test_case.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 60ac3e08a1..8eddc5a9ed 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -125,12 +125,9 @@ module ActiveRecord
     end
 
     def call(name, start, finish, message_id, values)
-      sql = values[:sql]
-
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      return if "CACHE" == values[:name]
+      return if values[:cached]
 
+      sql = values[:sql]
       self.class.log_all << sql
       self.class.log << sql unless ignore.match?(sql)
     end
-- 
cgit v1.2.3