Permalink
Browse files

Added check for RAILS_CONNECTION_ADAPTERS on startup and only load th…

…e connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2249 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 40b7809 commit 428e0f4e6321687d63ce9a431691e33971924bbc @dhh dhh committed Sep 15, 2005
Showing with 3 additions and 7 deletions.
  1. +1 −1 activerecord/CHANGELOG
  2. +2 −6 railties/lib/initializer.rb
View
@@ -1,6 +1,6 @@
*SVN*
-* Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958
+* Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]
* Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 [Florian Weber]
@@ -58,7 +58,8 @@ def set_load_path
end
def set_connection_adapters
- RAILS_CONNECTION_ADAPTERS = configuration.connection_adapters
+ adapters = configuration.connection_adapters
+ silence_warnings { Object.const_set("RAILS_CONNECTION_ADAPTERS", adapters) if adapters }
end
def require_frameworks
@@ -161,7 +162,6 @@ def initialize
self.cache_classes = default_cache_classes
self.breakpoint_server = default_breakpoint_server
self.whiny_nils = default_whiny_nils
- self.connection_adapters = default_connection_adapters
self.database_configuration_file = default_database_configuration_file
for framework in default_frameworks
@@ -265,9 +265,5 @@ def default_breakpoint_server
def default_whiny_nils
false
end
-
- def default_connection_adapters
- %w(mysql postgresql sqlite sqlserver db2 oci)
- end
end
end

0 comments on commit 428e0f4

Please sign in to comment.