aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-01 07:38:15 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-01 07:38:15 -0800
commite015f4e2e3e962a3713f40e91aa049d47ed7c7f2 (patch)
tree93c10d24039596d5ca45a3d5052a3f349129996a /activerecord
parent3e1e36b5addc9b89ebcc6562d697dccb98e76a59 (diff)
parent85a1f7ae1e66cff7fa2cf8a1be3721da38acd579 (diff)
downloadrails-e015f4e2e3e962a3713f40e91aa049d47ed7c7f2.tar.gz
rails-e015f4e2e3e962a3713f40e91aa049d47ed7c7f2.tar.bz2
rails-e015f4e2e3e962a3713f40e91aa049d47ed7c7f2.zip
Merge pull request #13556 from yahonda/update_mysql_grant
Update grant statement to address #13549
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb2
-rw-r--r--activerecord/test/cases/adapters/mysql2/connection_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 605a2d86e4..578f6301bd 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -18,7 +18,7 @@ module ActiveRecord
def test_bad_connection_mysql
assert_raise ActiveRecord::NoDatabaseError do
- configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'should_not_exist-cinco-dog-db')
+ configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'inexistent_activerecord_unittest')
connection = ActiveRecord::Base.mysql_connection(configuration)
connection.exec_query('drop table if exists ex')
end
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 8fe8bd7df3..9b7202c915 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -15,7 +15,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase
def test_bad_connection
assert_raise ActiveRecord::NoDatabaseError do
- configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'should_not_exist-cinco-dog-db')
+ configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'inexistent_activerecord_unittest')
connection = ActiveRecord::Base.mysql2_connection(configuration)
connection.exec_query('drop table if exists ex')
end