From 5f26ce699f9e695c434cbff20626a9ff4d3114e4 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 12 Mar 2012 11:51:28 -0700 Subject: make sure connections returned after close are marked as in_use --- .../connection_adapters/abstract/connection_pool.rb | 16 ++++++++++++++++ activerecord/test/cases/connection_pool_test.rb | 10 ++++++++++ 2 files changed, 26 insertions(+) (limited to 'activerecord') 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 4787bd2cbf..f198be0802 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -269,11 +269,27 @@ connection. For example: ActiveRecord::Base.connection.close conn.expire @queue.signal end + + release conn end end private + def release(conn) + thread_id = nil + + if @reserved_connections[current_connection_id] == conn + thread_id = current_connection_id + else + thread_id = @reserved_connections.keys.find { |k| + @reserved_connections[k] == conn + } + end + + @reserved_connections.delete thread_id if thread_id + end + def new_connection ActiveRecord::Base.send(spec.adapter_method, spec.config) end diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index dd0acfdd03..5cecfa90e7 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -31,6 +31,16 @@ module ActiveRecord pool.connections.find_all(&:in_use?) end + def test_checkout_after_close + connection = pool.connection + assert connection.in_use? + + connection.close + assert !connection.in_use? + + assert pool.connection.in_use? + end + def test_released_connection_moves_between_threads thread_conn = nil -- cgit v1.2.3