diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-01 06:42:39 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 06:42:39 +1030 |
| commit | 3664e9cb798ea47a6ef10088b3fb2a7529b0dc9b (patch) | |
| tree | c06a3c7d9cb6d143419811c1cf9249fc7590e90f /activerecord | |
| parent | 6ae64c13fd22cd9e5fed02235c056123193611dc (diff) | |
| parent | 82e973dfd523e6ad298a43840b55c2d0f16591ec (diff) | |
| download | rails-3664e9cb798ea47a6ef10088b3fb2a7529b0dc9b.tar.gz rails-3664e9cb798ea47a6ef10088b3fb2a7529b0dc9b.tar.bz2 rails-3664e9cb798ea47a6ef10088b3fb2a7529b0dc9b.zip | |
Merge pull request #31021 from yahonda/add_all_sequences_to_oracle_ignored
Address incorrect number of queries executed at Oracle enhanced adapter
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 e57ebf56c8..06a8693a7d 100644 --- a/activerecord/test/cases/test_case.rb +++ b/activerecord/test/cases/test_case.rb @@ -110,7 +110,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, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/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, /^\s*select .* from all_sequences/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] 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] |