diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-18 00:02:49 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-18 00:02:49 -0800 |
| commit | 97eae3b72b7e5eea88cb20266df731374c52f30d (patch) | |
| tree | 2a2fb6e159713eee799fd24756cfc135d7b7c1b3 | |
| parent | f60d00c56eb93d8a9ffb85a3af7e405f33ddf7f5 (diff) | |
| parent | d7c2958a03c1627d61f3aa982cbc3cb8fdb2440c (diff) | |
| download | rails-97eae3b72b7e5eea88cb20266df731374c52f30d.tar.gz rails-97eae3b72b7e5eea88cb20266df731374c52f30d.tar.bz2 rails-97eae3b72b7e5eea88cb20266df731374c52f30d.zip | |
Merge pull request #12931 from yahonda/add_oracle_ignored
Do not count query for all_constraints and all_tab_cols tested with Oracle
| -rw-r--r-- | activerecord/test/cases/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb index 910f46d693..4476ce3410 100644 --- a/activerecord/test/cases/test_case.rb +++ b/activerecord/test/cases/test_case.rb @@ -77,7 +77,7 @@ module ActiveRecord # FIXME: this needs to be refactored so specific database can add their own # 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] + 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] 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] |