Changeset 1910

Timestamp:

07/24/05 08:16:07 (3 years ago)

Author:

david

Message:

Allow ERb in the database.yml file (just like with fixtures), so you can pull out the database configuration in environment variables #1822 [Duane Johnson]

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/environments/environment.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow ERb in the database.yml file (just like with fixtures), so you can pull out the database configuration in environment variables #1822 [Duane Johnson]
-
-* Added convenience controls for FCGI processes (especially when managed remotely): spinner, spawner, and reaper. They reside in script/process. More details can be had by calling them with -h/--help.

trunk/railties/environments/environment.rb

@@ -62 +62 @@
-# Environment-specific configuration.
-require_dependency "environments/#{RAILS_ENV}"
-File.open("#{RAILS_ROOT}/config/database.yml") { |f| YAML::load(f) }
+YAML::load(ERB.new((IO.read("#{RAILS_ROOT}/config/database.yml"))).result)
-ActiveRecord::Base.establish_connection
-