aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2014-08-15 02:41:17 +0900
committerAkira Matsuda <ronnie@dio.jp>2014-08-15 02:44:57 +0900
commitc8ede235374e948f2922250b2c322b6bc70a2449 (patch)
treeb7fec14f1f90ae5ce47b39e6e575e6b4596d0805 /activerecord
parent6c51cc85da458969299ae3d0565dccc3a8530df9 (diff)
downloadrails-c8ede235374e948f2922250b2c322b6bc70a2449.tar.gz
rails-c8ede235374e948f2922250b2c322b6bc70a2449.tar.bz2
rails-c8ede235374e948f2922250b2c322b6bc70a2449.zip
Ignore MySQL "SHOW VARIABLES" when counting queries
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/test_case.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 23a170388e..4070216733 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -93,7 +93,7 @@ module ActiveRecord
# ignored SQL, or better yet, use a different notification for the queries
# instead examining the SQL content.
oracle_ignored = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/im]
- mysql_ignored = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i]
+ mysql_ignored = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /]
postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im, /^SHOW search_path/i]
sqlite3_ignored = [/^\s*SELECT name\b.*\bFROM sqlite_master/im]