diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2014-02-22 09:18:53 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2014-02-22 09:18:53 -0700 |
commit | 58ba48e4b35c840f56b4fcbb6c8e4b489d785e15 (patch) | |
tree | 6690dd0a46203063dcbc812e4c301fc37ac06344 /activerecord/lib | |
parent | 467cb908dd5f40cbfefe41b93e219682a3ced535 (diff) | |
download | rails-58ba48e4b35c840f56b4fcbb6c8e4b489d785e15.tar.gz rails-58ba48e4b35c840f56b4fcbb6c8e4b489d785e15.tar.bz2 rails-58ba48e4b35c840f56b4fcbb6c8e4b489d785e15.zip |
Distinguish ConnectionNotEstablished messages: no conn pool for the class, or no conn available from the pool
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 759e162e19..fd185de589 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -538,7 +538,10 @@ module ActiveRecord # for (not necessarily the current class). def retrieve_connection(klass) #:nodoc: pool = retrieve_connection_pool(klass) - (pool && pool.connection) or raise ConnectionNotEstablished + raise ConnectionNotEstablished, "No connection pool for #{klass}" unless pool + conn = pool.connection + raise ConnectionNotEstablished, "No connection for #{klass} in connection pool" unless conn + conn end # Returns true if a connection that's accessible to this class has |