aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-12 20:18:04 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-12 20:18:04 +0200
commitda84c9d0d243bb3b27748e250cb7ef71df70bb65 (patch)
tree198b0f3f60872d573822f4fb313d582bf66e9a16 /activerecord
parentd030f830cfd903d43cd1436b0e97389728491f42 (diff)
downloadrails-da84c9d0d243bb3b27748e250cb7ef71df70bb65.tar.gz
rails-da84c9d0d243bb3b27748e250cb7ef71df70bb65.tar.bz2
rails-da84c9d0d243bb3b27748e250cb7ef71df70bb65.zip
Remove old rubygems require.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 23c42d670b..8e74eff0ab 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -66,15 +66,9 @@ module ActiveRecord
unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
begin
- require 'rubygems'
- gem "activerecord-#{spec[:adapter]}-adapter"
require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
rescue LoadError
- begin
- require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
- rescue LoadError
- raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
- end
+ raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
end
adapter_method = "#{spec[:adapter]}_connection"