From d0dfe16ccc7eda1d0f3e6b13491736bdc72a4f42 Mon Sep 17 00:00:00 2001 From: iwiznia Date: Thu, 21 Feb 2013 16:11:28 +0100 Subject: Update railties/lib/rails/application/configuration.rb Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"] --- railties/lib/rails/application/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 1b88b834c7..a80868400d 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -97,7 +97,7 @@ module Rails self end - # Loads and returns the contents of the #database_configuration_file. The + # 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. def database_configuration -- cgit v1.2.3 From 7b6f2a0f24e7b58aa7e6dd5dfc4ee66320f2395f Mon Sep 17 00:00:00 2001 From: iwiznia Date: Thu, 21 Feb 2013 16:41:26 +0100 Subject: Update railties/lib/rails/application/configuration.rb Better comment for database_configuration method --- railties/lib/rails/application/configuration.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties') 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} -- cgit v1.2.3