diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:37:24 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:39:24 -0600 |
| commit | 4c42c89b0482f8ccde625e4d4699cd14f5f20afc (patch) | |
| tree | 66df33f707b9823ff782958008eef3e479879f02 /activerecord/test/cases/test_case.rb | |
| parent | 0ceaa733aa327e2117c5e059f4cd00126449e8e8 (diff) | |
| parent | 1a836b21b93acd6851bcb4f83c8b2678282d9122 (diff) | |
| download | rails-4c42c89b0482f8ccde625e4d4699cd14f5f20afc.tar.gz rails-4c42c89b0482f8ccde625e4d4699cd14f5f20afc.tar.bz2 rails-4c42c89b0482f8ccde625e4d4699cd14f5f20afc.zip | |
Fix merge conflicts for #18856
Diffstat (limited to 'activerecord/test/cases/test_case.rb')
| -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 47e664f4e7..f2f0c11594 100644 --- a/activerecord/test/cases/test_case.rb +++ b/activerecord/test/cases/test_case.rb @@ -103,7 +103,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 FULL TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^\s*SELECT (?:column_name|table_name)\b.*\bFROM information_schema\.(?:key_column_usage|tables)\b/im] + mysql_ignored = [/^SHOW FULL TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^SELECT DATABASE\(\) as db$/, /^SELECT table_name FROM information_schema\.tables/] postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select tablename\b.*from pg_tables\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, /^\s*SELECT sql\b.*\bFROM sqlite_master/im] |