aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-09-20 12:43:12 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-09-20 12:43:12 -0500
commita30b8d38b41ba9c141e867836a3a9c5b21221bea (patch)
tree02dbda3de620bebf0b11f58615b3c7706bd5a677 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
parent303448950013444b9f7d71defb4bb503a29eccf2 (diff)
downloadrails-a30b8d38b41ba9c141e867836a3a9c5b21221bea.tar.gz
rails-a30b8d38b41ba9c141e867836a3a9c5b21221bea.tar.bz2
rails-a30b8d38b41ba9c141e867836a3a9c5b21221bea.zip
rename AR::Model::Tag to AR::Tag - fixes #7714
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb6
1 files changed, 3 insertions, 3 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 f42a5df75f..42bd16db80 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -6,7 +6,7 @@ require 'active_support/core_ext/module/deprecation'
module ActiveRecord
# Raised when a connection could not be obtained within the connection
# acquisition timeout period: because max connections in pool
- # are in use.
+ # are in use.
class ConnectionTimeoutError < ConnectionNotEstablished
end
@@ -417,7 +417,7 @@ module ActiveRecord
# queue for a connection to become available.
#
# Raises:
- # - ConnectionTimeoutError if a connection could not be acquired
+ # - ConnectionTimeoutError if a connection could not be acquired
def acquire_connection
if conn = @available.poll
conn
@@ -567,7 +567,7 @@ module ActiveRecord
class_to_pool[klass] ||= begin
until pool = pool_for(klass)
klass = klass.superclass
- break unless klass < Model::Tag
+ break unless klass < ActiveRecord::Tag
end
class_to_pool[klass] = pool || pool_for(ActiveRecord::Model)