diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-12-23 20:32:44 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-12-23 20:32:44 +0100 |
| commit | f6e363309a6cffacd6087f3a901c562265c3b2ed (patch) | |
| tree | 04c81b862ba3fbb447ade5cf4afce64cdea8def5 /railties | |
| parent | facf2b47a46fae6aa18a6b1a5f6d2dff8714e3e6 (diff) | |
| download | rails-f6e363309a6cffacd6087f3a901c562265c3b2ed.tar.gz rails-f6e363309a6cffacd6087f3a901c562265c3b2ed.tar.bz2 rails-f6e363309a6cffacd6087f3a901c562265c3b2ed.zip | |
Use the new Resolver API in dbconsole
Diffstat (limited to 'railties')
| -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 |