aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-01-19 02:07:27 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-22 05:24:23 +0900
commit31ccedd440617edeaa9b11b89219a65ec7225442 (patch)
treeb7024e3f6342b57321dc8f24fc4871114122e5d0 /activerecord/lib/active_record
parent5538a020773a44ff8b43c03ba3b84e9fcade534e (diff)
downloadrails-31ccedd440617edeaa9b11b89219a65ec7225442.tar.gz
rails-31ccedd440617edeaa9b11b89219a65ec7225442.tar.bz2
rails-31ccedd440617edeaa9b11b89219a65ec7225442.zip
Ignore schema queries on SQLite 3 as well
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/test_case.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index 395872040b..dee8bc12ae 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -68,8 +68,9 @@ module ActiveRecord
oracle_ignored = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
mysql_ignored = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/]
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]
- [oracle_ignored, mysql_ignored, postgresql_ignored].each do |db_ignored_sql|
+ [oracle_ignored, mysql_ignored, postgresql_ignored, sqlite3_ignored].each do |db_ignored_sql|
ignored_sql.concat db_ignored_sql
end