diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-08 15:40:23 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-08 15:47:18 -0800 |
commit | cff19cf545de61ada8904d9d3daaaa594a9a931f (patch) | |
tree | f48585317c6bcfb42acabd5498a9d8e591f99778 | |
parent | 263d8424b36a80aa44ade979c4eaf686a58a99aa (diff) | |
download | rails-cff19cf545de61ada8904d9d3daaaa594a9a931f.tar.gz rails-cff19cf545de61ada8904d9d3daaaa594a9a931f.tar.bz2 rails-cff19cf545de61ada8904d9d3daaaa594a9a931f.zip |
make active_connection? return true only if there is an open connection in use for the current thread. fixes #5330
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 7 | ||||
-rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 42 |
2 files changed, 46 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 698da34d26..7e8d13a030 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -95,10 +95,11 @@ module ActiveRecord @reserved_connections[current_connection_id] ||= checkout end - # Check to see if there is an active connection in this connection - # pool. + # Is there an open connection that is being used for the current thread? def active_connection? - active_connections.any? + @reserved_connections.fetch(current_connection_id) { + return false + }.in_use? end # Signal that the thread is finished with the current connection. diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index d170a13b23..ea3b159015 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -3,7 +3,11 @@ require "cases/helper" module ActiveRecord module ConnectionAdapters class ConnectionPoolTest < ActiveRecord::TestCase + attr_reader :pool + def setup + super + # Keep a duplicate pool so we do not bother others @pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec @@ -18,6 +22,44 @@ module ActiveRecord end end + def teardown + super + @pool.disconnect! + end + + def active_connections(pool) + pool.connections.find_all(&:in_use?) + end + + def test_with_connection + assert_equal 0, active_connections(pool).size + + main_thread = pool.connection + assert_equal 1, active_connections(pool).size + + Thread.new { + pool.with_connection do |conn| + assert conn + assert_equal 2, active_connections(pool).size + end + assert_equal 1, active_connections(pool).size + }.join + + main_thread.close + assert_equal 0, active_connections(pool).size + end + + def test_active_connection_in_use + assert !pool.active_connection? + main_thread = pool.connection + + assert pool.active_connection? + + main_thread.close + + assert !pool.active_connection? + end + def test_active_connection? assert !@pool.active_connection? assert @pool.connection |