aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-12-15 22:01:30 +0000
committerAbdelkader Boudih <terminale@gmail.com>2015-12-17 15:54:57 +0000
commitfb24d0ed6c26da70045c6fc128aaa9dcb777c28c (patch)
tree43de162a22b07482034c63f75d58e6e3cf230c8f /railties
parent0957c8ad6722c1a82c16f70b23fe1f7cb2607ff5 (diff)
downloadrails-fb24d0ed6c26da70045c6fc128aaa9dcb777c28c.tar.gz
rails-fb24d0ed6c26da70045c6fc128aaa9dcb777c28c.tar.bz2
rails-fb24d0ed6c26da70045c6fc128aaa9dcb777c28c.zip
Remove legacy mysql adapter
Diffstat (limited to 'railties')
-rw-r--r--railties/test/commands/dbconsole_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 7950ed6aa7..a5aa6c14a2 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -113,19 +113,19 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
end
def test_mysql
- start(adapter: 'mysql', database: 'db')
+ start(adapter: 'mysql2', database: 'db')
assert !aborted
assert_equal [%w[mysql mysql5], 'db'], dbconsole.find_cmd_and_exec_args
end
def test_mysql_full
- start(adapter: 'mysql', database: 'db', host: 'locahost', port: 1234, socket: 'socket', username: 'user', password: 'qwerty', encoding: 'UTF-8')
+ start(adapter: 'mysql2', database: 'db', host: 'locahost', port: 1234, socket: 'socket', username: 'user', password: 'qwerty', encoding: 'UTF-8')
assert !aborted
assert_equal [%w[mysql mysql5], '--host=locahost', '--port=1234', '--socket=socket', '--user=user', '--default-character-set=UTF-8', '-p', 'db'], dbconsole.find_cmd_and_exec_args
end
def test_mysql_include_password
- start({adapter: 'mysql', database: 'db', username: 'user', password: 'qwerty'}, ['-p'])
+ start({adapter: 'mysql2', database: 'db', username: 'user', password: 'qwerty'}, ['-p'])
assert !aborted
assert_equal [%w[mysql mysql5], '--user=user', '--password=qwerty', 'db'], dbconsole.find_cmd_and_exec_args
end