aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-09-16 11:55:44 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-09-16 11:55:44 -0700
commit82efe8943bf6ff12b597987506bf177d66609049 (patch)
treedcf5a5ca4516a996bb5b78bd4d79b66ba3aeae9e /activerecord/test/cases
parentaa81bf74574629ab585de57f5aa18689de723b9d (diff)
parent5bb056d268c9fc8c08c04ef04aef0c499b08a12c (diff)
downloadrails-82efe8943bf6ff12b597987506bf177d66609049.tar.gz
rails-82efe8943bf6ff12b597987506bf177d66609049.tar.bz2
rails-82efe8943bf6ff12b597987506bf177d66609049.zip
Merge pull request #7657 from kennyj/fix_6458-2
Don't explain except normal CRUD sql.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/explain_subscriber_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/explain_subscriber_test.rb b/activerecord/test/cases/explain_subscriber_test.rb
index 91e1df91cd..b425967678 100644
--- a/activerecord/test/cases/explain_subscriber_test.rb
+++ b/activerecord/test/cases/explain_subscriber_test.rb
@@ -38,6 +38,13 @@ if ActiveRecord::Base.connection.supports_explain?
end
end
+ def test_collects_nothing_if_unexplained_sqls
+ with_queries([]) do |queries|
+ SUBSCRIBER.finish(nil, nil, :name => 'SQL', :sql => 'SHOW max_identifier_length')
+ assert queries.empty?
+ end
+ end
+
def with_queries(queries)
Thread.current[:available_queries_for_explain] = queries
yield queries