diff options
| author | TomK32 <tomk32@tomk32.de> | 2008-05-16 11:13:32 +0200 |
|---|---|---|
| committer | TomK32 <tomk32@tomk32.de> | 2008-05-16 11:13:32 +0200 |
| commit | fa0cca368f74119b561595cc6ca7454f7debdf6b (patch) | |
| tree | 85022a5047c4d8da55a981cc3c1b8cc65f1adcd8 /railties/lib/commands | |
| parent | f16c22040d5b66cb285fbd9a90858294376192bb (diff) | |
| parent | 4e2bc02163aa646ab1304b1b5bec98a7af8927f5 (diff) | |
| download | rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.tar.gz rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.tar.bz2 rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/commands')
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 28c3a3e41f..3e5010c688 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -1,3 +1,4 @@ +require 'erb' require 'yaml' require 'optparse' @@ -8,7 +9,7 @@ OptionParser.new do |opt| end env = ARGV.first || ENV['RAILS_ENV'] || 'development' -unless config = YAML.load_file(RAILS_ROOT + "/config/database.yml")[env] +unless config = YAML::load(ERB.new(IO.read(RAILS_ROOT + "/config/database.yml")).result)[env] abort "No database is configured for the environment '#{env}'" end |