aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPeter Schrammel <peter.schrammel@experteer.com>2014-11-25 08:56:01 +0100
committerPeter Schrammel <peter.schrammel@experteer.com>2014-11-25 08:56:01 +0100
commit1c61b74ce2844e9d41e7f3ecb9e0bd9d11db201a (patch)
treec1f0fb6d01f12ab10c7e15f9b5c4201ad188d426 /railties
parent79eedb346e103c5ff8e488b992c80b625c864097 (diff)
downloadrails-1c61b74ce2844e9d41e7f3ecb9e0bd9d11db201a.tar.gz
rails-1c61b74ce2844e9d41e7f3ecb9e0bd9d11db201a.tar.bz2
rails-1c61b74ce2844e9d41e7f3ecb9e0bd9d11db201a.zip
be more general with adapter name
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/dbconsole.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 1a2613a8d0..cb0936d1ef 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -44,7 +44,7 @@ module Rails
find_cmd_and_exec(['mysql', 'mysql5'], *args)
- when "postgresql", "postgres", "postgis"
+ when /postgres|postgis/
ENV['PGUSER'] = config["username"] if config["username"]
ENV['PGHOST'] = config["host"] if config["host"]
ENV['PGPORT'] = config["port"].to_s if config["port"]