1 files changed, 7 insertions, 25 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 577a362568..2c683fc3ac 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -38,7 +38,7 @@ module ActiveRecord
         private
         def resolve_string_connection(spec) # :nodoc:
           hash = configurations.fetch(spec) do |k|
-            connection_url_to_hash(k)
+            self.class.connection_url_to_hash(k)
           end
 
           raise(AdapterNotSpecified, "#{spec} database is not configured") unless hash
@@ -51,10 +51,13 @@ module ActiveRecord
 
           raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
 
+          path_to_adapter = "active_record/connection_adapters/#{spec[:adapter]}_adapter"
           begin
-            require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+            require path_to_adapter
+          rescue Gem::LoadError => e
+            raise Gem::LoadError, "Specified '#{spec[:adapter]}' for database adapter, but the gem is not loaded. Add `gem '#{e.name}'` to your Gemfile."
           rescue LoadError => e
-            raise LoadError, "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{e.message})", e.backtrace
+            raise LoadError, "Could not load '#{path_to_adapter}'. Make sure that the adapter in config/database.yml is valid. If you use an adapter other than 'mysql', 'mysql2', 'postgresql' or 'sqlite3' add the necessary adapter gem to the Gemfile.", e.backtrace
           end
 
           adapter_method = "#{spec[:adapter]}_connection"
@@ -62,11 +65,7 @@ module ActiveRecord
           ConnectionSpecification.new(spec, adapter_method)
         end
 
-        # For DATABASE_URL, accept a limited concept of ints and floats
-        SIMPLE_INT = /\A\d+\z/
-        SIMPLE_FLOAT = /\A\d+\.\d+\z/
-
-        def connection_url_to_hash(url) # :nodoc:
+        def self.connection_url_to_hash(url) # :nodoc:
           config = URI.parse url
           adapter = config.scheme
           adapter = "postgresql" if adapter == "postgres"
@@ -86,28 +85,11 @@ module ActiveRecord
           if config.query
             options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
 
-            options.each { |key, value| options[key] = type_cast_value(value) }
-
             spec.merge!(options)
           end
 
           spec
         end
-
-        def type_cast_value(value)
-          case value
-          when SIMPLE_INT
-            value.to_i
-          when SIMPLE_FLOAT
-            value.to_f
-          when 'true'
-            true
-          when 'false'
-            false
-          else
-            value
-          end
-        end
       end
     end
   end