aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/test_case.rb
diff options
context:
space:
mode:
authorJean Boussier <jean.boussier@gmail.com>2016-09-22 15:00:30 +0200
committerJean Boussier <jean.boussier@gmail.com>2016-09-22 15:30:45 +0200
commit84d35da86c14767c737783cb95dd4624632cc1bd (patch)
tree487f03efc3f82c571c7bc6510f58554dfbfaeecc /activerecord/test/cases/test_case.rb
parent19966242163611e61d45ee4033f28aa6f967906a (diff)
downloadrails-84d35da86c14767c737783cb95dd4624632cc1bd.tar.gz
rails-84d35da86c14767c737783cb95dd4624632cc1bd.tar.bz2
rails-84d35da86c14767c737783cb95dd4624632cc1bd.zip
Preserve cached queries name in AS notifications
Diffstat (limited to 'activerecord/test/cases/test_case.rb')
-rw-r--r--activerecord/test/cases/test_case.rb7
1 files changed, 2 insertions, 5 deletions
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