aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-06-19 10:45:57 +0200
committerYves Senn <yves.senn@gmail.com>2015-06-19 10:45:57 +0200
commitee066afd188edb4c30a40f736c5f9bd0e9960fb3 (patch)
tree163ef38e4f576d981864250658479e50afd787dc /activerecord/lib/active_record
parent27026804e20e6467e86013e1dbc2dac5511c8bd5 (diff)
parentacdb006ad0e3926702e9df13effd4577db4dd0ad (diff)
downloadrails-ee066afd188edb4c30a40f736c5f9bd0e9960fb3.tar.gz
rails-ee066afd188edb4c30a40f736c5f9bd0e9960fb3.tar.bz2
rails-ee066afd188edb4c30a40f736c5f9bd0e9960fb3.zip
Merge pull request #19843 from marshall-lee/explain_cte_queries
Let WITH (CTE) queries be explainable Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/explain_subscriber.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/explain_subscriber.rb b/activerecord/lib/active_record/explain_subscriber.rb
index 6a49936644..9adabd7819 100644
--- a/activerecord/lib/active_record/explain_subscriber.rb
+++ b/activerecord/lib/active_record/explain_subscriber.rb
@@ -19,7 +19,7 @@ module ActiveRecord
# On the other hand, we want to monitor the performance of our real database
# queries, not the performance of the access to the query cache.
IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
- EXPLAINED_SQLS = /\A\s*(select|update|delete|insert)\b/i
+ EXPLAINED_SQLS = /\A\s*(with|select|update|delete|insert)\b/i
def ignore_payload?(payload)
payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) || payload[:sql] !~ EXPLAINED_SQLS
end