diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-16 23:44:28 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-16 23:44:28 +0100 |
| commit | 17c8cba3a04d715e1063e5adea2b22abce417527 (patch) | |
| tree | a733a5c24ba1411968e448185a7097be1151e63a /railties/lib | |
| parent | 0fc3381aa5359f31b36057d7bfba2e0eb6a3c064 (diff) | |
| parent | 46f30f902fb5e705683dea19ec22179c61e5f208 (diff) | |
| download | rails-17c8cba3a04d715e1063e5adea2b22abce417527.tar.gz rails-17c8cba3a04d715e1063e5adea2b22abce417527.tar.bz2 rails-17c8cba3a04d715e1063e5adea2b22abce417527.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 3e5010c688..b81997aa59 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -40,10 +40,11 @@ when "mysql" exec(find_cmd('mysql5', 'mysql'), *args) when "postgresql" + ENV['PGUSER'] = config["username"] if config["username"] ENV['PGHOST'] = config["host"] if config["host"] ENV['PGPORT'] = config["port"].to_s if config["port"] ENV['PGPASSWORD'] = config["password"].to_s if config["password"] - exec(find_cmd('psql'), '-U', config["username"], config["database"]) + exec(find_cmd('psql'), config["database"]) when "sqlite" exec(find_cmd('sqlite'), config["database"]) |