aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-03-04 16:35:36 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-03-04 16:35:36 -0300
commit357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6 (patch)
treeced2a33848e449b60d9dcd375f35b4c8509a5edb /activerecord
parentf8f66a3792629963e91015398985cb4fad9e5900 (diff)
downloadrails-357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6.tar.gz
rails-357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6.tar.bz2
rails-357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6.zip
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.rb2
-rw-r--r--activerecord/test/cases/adapters/mysql2/schema_test.rb2
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