aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-11-28 11:46:16 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-11-28 15:23:25 -0800
commitffb218c750a876758f92e04a96a0676c77943208 (patch)
tree517dfaf5a9a5f0df3df9a13e88f0dcf588666a17 /activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
parent2a9a8ad4dfb2609a2275c1a3540ad2768562a026 (diff)
downloadrails-ffb218c750a876758f92e04a96a0676c77943208.tar.gz
rails-ffb218c750a876758f92e04a96a0676c77943208.tar.bz2
rails-ffb218c750a876758f92e04a96a0676c77943208.zip
pools are 1:1 with spec now rather than 1:1 with class
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb3
1 files changed, 2 insertions, 1 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 e335ebd9c2..e1f3d40bc3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -82,7 +82,8 @@ module ActiveRecord
def self.resolve_hash_connection(spec) # :nodoc:
spec = spec.symbolize_keys
- unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
+
+ raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
begin
require "active_record/connection_adapters/#{spec[:adapter]}_adapter"