aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-12-18 13:46:18 +1030
committerMatthew Draper <matthew@trebex.net>2015-12-18 13:51:04 +1030
commit4a58aef7e3035e775b4cd6cc65575c8ed02cd8af (patch)
tree683e0e7b82ceae65ebc0dd864a910546781d7fe0 /railties
parent7a6772c0e7acc10f4edad8ce3e6d401524ea1336 (diff)
parentfb24d0ed6c26da70045c6fc128aaa9dcb777c28c (diff)
downloadrails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.tar.gz
rails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.tar.bz2
rails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.zip
Merge pull request #22642 from seuros/remove-mysql-adapter
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