aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 17:34:20 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 17:34:20 -0700
commit51a5e906581351484489088d16ae5870d156c1d5 (patch)
tree1afea75995e40a94eaf02049dc289be15d51c1a6 /railties
parent37bacd3df278f65127fce14bd4d8e69b29dabf38 (diff)
parent2f35f613badf9ed75140ce46b3bd28c4b9c86863 (diff)
downloadrails-51a5e906581351484489088d16ae5870d156c1d5.tar.gz
rails-51a5e906581351484489088d16ae5870d156c1d5.tar.bz2
rails-51a5e906581351484489088d16ae5870d156c1d5.zip
Merge pull request #10666 from YanhaoYang/master
Make "rails dbconsole" work with activerecord-postgis-adapter
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 5914c9e4ae..3e4cc787c4 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"
+ when "postgresql", "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"]