diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 07:10:36 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 07:10:36 -0800 |
| commit | 3a0b6c8e135e268c1550f93db1b63ba27457dec2 (patch) | |
| tree | a192d86909d0f404a81eb3518bb106336c8f673b /railties/lib/rails/application/configuration.rb | |
| parent | ebae71a67a6c4d0421efd932b2af88c48b8b1c7c (diff) | |
| parent | b1de1892bc0f228da307346e029c37602ff3f5a8 (diff) | |
| download | rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.tar.gz rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.tar.bz2 rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.zip | |
Merge pull request #9120 from hone/db_migrate_with_database_url
fix rake db:migrate when used with ENV['DATABASE_URL']
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 2c7ddd86e7..1b88b834c7 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -101,8 +101,12 @@ module Rails # contents of the file are processed via ERB before being sent through # YAML::load. def database_configuration - require 'erb' - YAML.load ERB.new(IO.read(paths["config/database"].first)).result + if ENV['DATABASE_URL'] + {Rails.env => ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.connection_url_to_hash(ENV['DATABASE_URL']).stringify_keys} + else + require 'erb' + YAML.load ERB.new(IO.read(paths["config/database"].first)).result + end rescue Psych::SyntaxError => e raise "YAML syntax error occurred while parsing #{paths["config/database"].first}. " \ "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \ |