diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-05 21:17:25 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-05 21:17:25 -0300 |
commit | d76b52844d62c868a0cdca34fc871a6b7b096efe (patch) | |
tree | 3f6ca38f7622f8a132db3f56b17a781e09a51f41 | |
parent | 7d24aa7dcf58923dca9d0591e14785340e63d158 (diff) | |
parent | dac5399af04c84c6021ee2bc169a3d17944a5fa2 (diff) | |
download | rails-d76b52844d62c868a0cdca34fc871a6b7b096efe.tar.gz rails-d76b52844d62c868a0cdca34fc871a6b7b096efe.tar.bz2 rails-d76b52844d62c868a0cdca34fc871a6b7b096efe.zip |
Merge pull request #14984 from jkingdon/add-jdbcmysql
Fix rails dbconsole for jdbcmysql adapter
-rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index f6d8aec30d..1a2613a8d0 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -20,7 +20,7 @@ module Rails ENV['RAILS_ENV'] = options[:environment] || environment case config["adapter"] - when /^mysql/ + when /^(jdbc)?mysql/ args = { 'host' => '--host', 'port' => '--port', |