From f6e363309a6cffacd6087f3a901c562265c3b2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 20:32:44 +0100
Subject: Use the new Resolver API in dbconsole

---
 railties/lib/rails/commands/dbconsole.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails/commands/dbconsole.rb')

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
 
-- 
cgit v1.2.3