diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:54:22 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:54:22 -0600 |
| commit | 3e29d96ecda48a287601ec09321f7444df8266be (patch) | |
| tree | 7eca9b23ea11ebb273140c8a66ccce9e44f6bd43 /activerecord | |
| parent | 03aacc55a239345a3ca8b36d188a338e7dab5189 (diff) | |
| download | rails-3e29d96ecda48a287601ec09321f7444df8266be.tar.gz rails-3e29d96ecda48a287601ec09321f7444df8266be.tar.bz2 rails-3e29d96ecda48a287601ec09321f7444df8266be.zip | |
Fix test failures caused by d99db6b8b3e4
I messed up the merge conflict, and accidentally removed a schema query
that needed to be ignored.
Diffstat (limited to 'activerecord')
| -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 f2f0c11594..6020a3c832 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 /, /^SELECT DATABASE\(\) as db$/, /^SELECT table_name FROM information_schema\.tables/] + mysql_ignored = [/^SHOW FULL TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^SELECT DATABASE\(\) as db$/, /^\s*SELECT (?:column_name|table_name)\b.*\bFROM information_schema\.(?:key_column_usage|tables)\b/im] 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] |