diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-20 20:45:30 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-20 20:45:30 +0100 |
| commit | 99c8c8df1a7cfe452177d33cd4ca9a0ee4a05cf4 (patch) | |
| tree | 273fed4f67ef0dce107f243966a920fe9753caff /activerecord/test | |
| parent | 64766e82d6b80e89eea98dfb4798ac0e40d88a59 (diff) | |
| parent | e29f02e1bd4d424f7b0294958251aa49e88d688e (diff) | |
| download | rails-99c8c8df1a7cfe452177d33cd4ca9a0ee4a05cf4.tar.gz rails-99c8c8df1a7cfe452177d33cd4ca9a0ee4a05cf4.tar.bz2 rails-99c8c8df1a7cfe452177d33cd4ca9a0ee4a05cf4.zip | |
Merge pull request #21687 from kamipo/refactor_table_exists
Refactor `table_exists?` in AbstractMysqlAdapter
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_test.rb | 8 | ||||
| -rw-r--r-- | activerecord/test/cases/test_case.rb | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb index 880a2123d2..faf2acb9cb 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb @@ -36,14 +36,6 @@ module ActiveRecord assert(!@connection.table_exists?("#{@db_name}.zomg"), "table should not exist") end - def test_tables_quoting - @connection.tables(nil, "foo-bar", nil) - flunk - rescue => e - # assertion for *quoted* database properly - assert_match(/database 'foo-bar'/, e.inspect) - end - def test_dump_indexes index_a_name = 'index_key_tests_on_snack' index_b_name = 'index_key_tests_on_pizza' diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb index f93e85f5e2..47e664f4e7 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 TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^\s*SELECT column_name\b.*\bFROM information_schema\.key_column_usage\b/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] |