diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 29 |
2 files changed, 18 insertions, 13 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 538acf172e..fdc127dff2 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -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] diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 54fdfd25cd..3d6290f50f 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -75,20 +75,23 @@ module ActiveRecord # 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 |