Permalink
Browse files

Added option to establish_connection where you'll be able to leave ou…

…t the parameter to have it use the RAILS_ENV environment variable

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Nov 25, 2004
1 parent a09824c commit 064877cab83d84fcf7be26e17639c5c2544ffc3d
Showing with 18 additions and 13 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +16 −13 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View
@@ -1,5 +1,7 @@
*CVS*
+* Added option to establish_connection where you'll be able to leave out the parameter to have it use the RAILS_ENV environment variable
+
* Added ADO-based SQLServerAdapter (only works on Windows) [Joey Gibson]
* Fixed problems with primary keys and postgresql sequences (#230) [Tim Bates]
@@ -75,20 +75,23 @@ def initialize (config, adapter_method)
# end
#
# Courses.establish_connection( ... )
- def self.establish_connection(spec)
- if spec.instance_of? ConnectionSpecification
- @@defined_connections[self] = spec
- elsif spec.is_a?(Symbol)
- establish_connection(configurations[spec.to_s])
- else
- if spec.nil? then raise AdapterNotSpecified end
- symbolize_strings_in_hash(spec)
- unless spec.key?(:adapter) then raise AdapterNotSpecified end
+ def self.establish_connection(spec = nil)
+ case spec
+ when nil
+ raise AdapterNotSpecified unless defined? RAILS_ENV
+ establish_connection(RAILS_ENV)
+ when ConnectionSpecification
+ @@defined_connections[self] = spec
+ when Symbol, String
+ establish_connection(configurations[spec.to_s])
+ else
+ symbolize_strings_in_hash(spec)
+ unless spec.key?(:adapter) then raise AdapterNotSpecified end
- adapter_method = "#{spec[:adapter]}_connection"
- unless methods.include?(adapter_method) then raise AdapterNotFound end
- remove_connection
- @@defined_connections[self] = ConnectionSpecification.new(spec, adapter_method)
+ adapter_method = "#{spec[:adapter]}_connection"
+ unless respond_to?(adapter_method) then raise AdapterNotFound end
+ remove_connection
+ establish_connection(ConnectionSpecification.new(spec, adapter_method))
end
end

0 comments on commit 064877c

Please sign in to comment.