diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-26 15:20:13 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-26 15:20:25 +0100 |
| commit | 683b476b4521b023b652065592eb7518d2d481c4 (patch) | |
| tree | 8d4ee09da6360f4ba4dc9efb7867aa5a8392b536 /railties | |
| parent | cb23d6a5ee34f6f7de15174cbd7b2920d6f4c956 (diff) | |
| parent | 1c61b74ce2844e9d41e7f3ecb9e0bd9d11db201a (diff) | |
| download | rails-683b476b4521b023b652065592eb7518d2d481c4.tar.gz rails-683b476b4521b023b652065592eb7518d2d481c4.tar.bz2 rails-683b476b4521b023b652065592eb7518d2d481c4.zip | |
Merge pull request #17761 from pschrammel/master
be more general with adapter name
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index b01cdce6ea..9014560611 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"] |