aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2016-05-07 12:25:37 -0500
committerArthur Neves <arthurnn@gmail.com>2016-05-24 22:03:00 -0400
commit5167b8f7ffa66c8772c455916b8418844e3b4674 (patch)
tree75443d0cf8311d52e4eb52d39ced3038b23d1f1d /activerecord/lib/active_record/connection_adapters/connection_specification.rb
parentbf219714dce494f5b69cb7dd9b8c43a68a4988da (diff)
downloadrails-5167b8f7ffa66c8772c455916b8418844e3b4674.tar.gz
rails-5167b8f7ffa66c8772c455916b8418844e3b4674.tar.bz2
rails-5167b8f7ffa66c8772c455916b8418844e3b4674.zip
Move establish_connection to handler
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 901c98b22b..7636de067c 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -180,6 +180,10 @@ module ActiveRecord
adapter_method = "#{spec[:adapter]}_connection"
+ unless ActiveRecord::Base.respond_to?(adapter_method)
+ raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
+ end
+
name ||=
if config.is_a?(Symbol)
config.to_s