diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-04 11:43:54 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-04 11:43:54 -0800 |
| commit | 393c2ddfdb3dcc28b435d75f3979d5af8997ec74 (patch) | |
| tree | ced2a33848e449b60d9dcd375f35b4c8509a5edb /activerecord | |
| parent | f8f66a3792629963e91015398985cb4fad9e5900 (diff) | |
| parent | 357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6 (diff) | |
| download | rails-393c2ddfdb3dcc28b435d75f3979d5af8997ec74.tar.gz rails-393c2ddfdb3dcc28b435d75f3979d5af8997ec74.tar.bz2 rails-393c2ddfdb3dcc28b435d75f3979d5af8997ec74.zip | |
Merge pull request #5271 from carlosantoniodasilva/ar-fix-build
Fix message assertions for quoting database name in "show tables" for mysql
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb index 073d0b0e73..5d6de90889 100644 --- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb +++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb @@ -52,7 +52,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, e.inspect) end end diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb index fd9996c937..10fdf88592 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb @@ -42,7 +42,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, e.inspect) end end |