From 971d5107cd4cd08c22a85d34546f4ba03ed5c925 Mon Sep 17 00:00:00 2001 From: Huiming Teo Date: Sun, 15 Dec 2013 14:07:34 +0800 Subject: fixed rails dbconsole to support ENV['DATABASE_URL']. --- railties/lib/rails/commands/dbconsole.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index 3e4cc787c4..847447fdad 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -81,14 +81,11 @@ module Rails def config @config ||= begin - cfg = begin - YAML.load(ERB.new(IO.read("config/database.yml")).result) - rescue SyntaxError, StandardError - require APP_PATH - Rails.application.config.database_configuration - end - - cfg[environment] || abort("No database is configured for the environment '#{environment}'") + require APP_PATH + ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new( + ENV['DATABASE_URL'], + (Rails.application.config.database_configuration || {}) + ).spec.config.stringify_keys end end -- cgit v1.2.3