diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-09 11:46:45 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-09 11:46:45 +0200 |
| commit | e1a0d86fe0355ddff8c86db0f42f3824ffe14c02 (patch) | |
| tree | 5833022ca41905f243c15c8a5ffdf864de69bfa6 /railties/lib/rails/commands/dbconsole.rb | |
| parent | 1ff3d951e620ddeeb97e87e2024391470e886467 (diff) | |
| parent | df508bd97062b871fe25eda8d1bb61cd43d79bc4 (diff) | |
| download | rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.tar.gz rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.tar.bz2 rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/commands/dbconsole.rb')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 8957f11724..5bbaf725df 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -55,7 +55,7 @@ module Rails end case config["adapter"] - when "mysql" + when /^mysql/ args = { 'host' => '--host', 'port' => '--port', @@ -114,4 +114,4 @@ end # Has to set the RAILS_ENV before config/application is required if ARGV.first && !ARGV.first.index("-") && env = ARGV.first ENV['RAILS_ENV'] = %w(production development test).find { |e| e.index(env) } || env -end
\ No newline at end of file +end |