aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-15 08:25:46 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-15 08:25:46 +0000
commit3e7b597ff4e6912818c5a9cc7498d7c03fe6d222 (patch)
tree9141136387ab4fcb46944664d551de7edc0ee1e5
parent428e0f4e6321687d63ce9a431691e33971924bbc (diff)
downloadrails-3e7b597ff4e6912818c5a9cc7498d7c03fe6d222.tar.gz
rails-3e7b597ff4e6912818c5a9cc7498d7c03fe6d222.tar.bz2
rails-3e7b597ff4e6912818c5a9cc7498d7c03fe6d222.zip
Cant use silence_warnings before active support is loaded
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2250 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/environments/environment.rb2
-rw-r--r--railties/lib/initializer.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 14654dff00..59ac96343e 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -19,7 +19,7 @@ Rails::Initializer.run do |config|
# config.log_level = :debug
# Only include the connection adapters you're actually going to use
- # config.connection_adapters = %w( mysql sqlite )
+ # config.connection_adapters = %w( mysql postgresql sqlite sqlserver db2 oci )
# Use the database for sessions instead of the file system
# (create the session table with 'rake create_sessions_table')
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 739a55f501..4ab29f98b9 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -58,8 +58,7 @@ module Rails
end
def set_connection_adapters
- adapters = configuration.connection_adapters
- silence_warnings { Object.const_set("RAILS_CONNECTION_ADAPTERS", adapters) if adapters }
+ Object.const_set("RAILS_CONNECTION_ADAPTERS", configuration.connection_adapters) if configuration.connection_adapters
end
def require_frameworks