kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #3979 from kommen/dbconsole_db_config

Browse source 
dbconsole: Use the app's database_configuration instead of duplicating loading code.
This commit is contained in:
Piotr Sarnacki 2011-12-14 05:48:04 -08:00
commit a5589db063
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/commands/dbconsole.rb
View file

@ -41,7 +41,7 @@ module Rails
abort opt.to_s unless (0..1).include?(ARGV.size) abort opt.to_s unless (0..1).include?(ARGV.size)
end end
unless config = YAML::load(ERB.new(IO.read("#{@app.root}/config/database.yml")).result)[Rails.env] unless config = @app.config.database_configuration[Rails.env]
abort "No database is configured for the environment '#{Rails.env}'" abort "No database is configured for the environment '#{Rails.env}'"
end end