aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authoriwiznia <iwiznia@hotmail.com>2013-02-21 16:41:26 +0100
committeriwiznia <iwiznia@hotmail.com>2013-02-21 16:41:26 +0100
commit7b6f2a0f24e7b58aa7e6dd5dfc4ee66320f2395f (patch)
tree8ecf08151b9b170a8a3c2b7180ad69678c775ac1 /railties/lib
parentd0dfe16ccc7eda1d0f3e6b13491736bdc72a4f42 (diff)
downloadrails-7b6f2a0f24e7b58aa7e6dd5dfc4ee66320f2395f.tar.gz
rails-7b6f2a0f24e7b58aa7e6dd5dfc4ee66320f2395f.tar.bz2
rails-7b6f2a0f24e7b58aa7e6dd5dfc4ee66320f2395f.zip
Update railties/lib/rails/application/configuration.rb
Better comment for database_configuration method
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a80868400d..17763b39c5 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -97,9 +97,9 @@ module Rails
self
end
- # Loads and returns the contents of the #paths["config/database"]. The
- # contents of the file are processed via ERB before being sent through
- # YAML::load.
+ # Loads and returns the configuration of the database.
+ # First, looks at If ENV['DATABASE_URL'] if it's not present it uses the #paths["config/database"]
+ # The contents of the file are processed via ERB before being sent through YAML::load.
def database_configuration
if ENV['DATABASE_URL']
{Rails.env => ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.connection_url_to_hash(ENV['DATABASE_URL']).stringify_keys}