aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2010-12-16 22:03:01 +0900
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-01 13:20:53 -0200
commit8a85f64abffde29ddfd521d63d566f98796ae400 (patch)
treed9507138a9dd1828493f35683c7472a0f85aae21
parent5dd803e9b1149f8e6d7de787e0c833c94f48d5a4 (diff)
downloadrails-8a85f64abffde29ddfd521d63d566f98796ae400.tar.gz
rails-8a85f64abffde29ddfd521d63d566f98796ae400.tar.bz2
rails-8a85f64abffde29ddfd521d63d566f98796ae400.zip
Accept 'postgres' as a PostgreSQL driver name in dbconsole for non-AR ORMs like DataMapper and Sequel
[#6180 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
-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 9dbc1699ee..f0d6ea1687 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -80,7 +80,7 @@ module Rails
exec(find_cmd('mysql', 'mysql5'), *args)
- when "postgresql"
+ when "postgresql", "postgres"
ENV['PGUSER'] = config["username"] if config["username"]
ENV['PGHOST'] = config["host"] if config["host"]
ENV['PGPORT'] = config["port"].to_s if config["port"]