diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-12-23 12:28:04 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-12-23 12:28:04 -0800 |
| commit | 33cb2f334db7d8c173a7f801a678fe5696169ed7 (patch) | |
| tree | 2bb07cdaad4af8c43ccc891503630bbed12cbf89 /railties/lib/rails/commands | |
| parent | 7530c82e8257effa8ee3a7e0a2f7aed39502d201 (diff) | |
| parent | 2d4cfb28408f53daea11f45fb5e0aebdce8963d3 (diff) | |
| download | rails-33cb2f334db7d8c173a7f801a678fe5696169ed7.tar.gz rails-33cb2f334db7d8c173a7f801a678fe5696169ed7.tar.bz2 rails-33cb2f334db7d8c173a7f801a678fe5696169ed7.zip | |
Merge pull request #13463 from josevalim/jv-env
Do not store production information in .yml files
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 847447fdad..09ee74ccae 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -83,9 +83,8 @@ module Rails @config ||= begin require APP_PATH ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new( - ENV['DATABASE_URL'], - (Rails.application.config.database_configuration || {}) - ).spec.config.stringify_keys + Rails.application.config.database_configuration || {} + ).resolve(ENV["DATABASE_URL"]).config.stringify_keys end end |