github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2249 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-09-15 06:42:07 +00:00
parent 40b7809de5
commit 428e0f4e63
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -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]

8
railties/lib/initializer.rb
View File

@@ -58,7 +58,8 @@ module Rails
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 @@ module Rails
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 @@ module Rails
def default_whiny_nils
false
end
def default_connection_adapters
%w(mysql postgresql sqlite sqlserver db2 oci)
end
end
end