diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-20 08:44:55 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-20 08:45:22 -0700 |
commit | ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94 (patch) | |
tree | 995cc580842ce7c8cb24f836d6d8f606d368963a /activerecord/test/cases/adapters/postgresql | |
parent | ef3e149db3e3e970236147fa1a3ba8e569b05c60 (diff) | |
download | rails-ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94.tar.gz rails-ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94.tar.bz2 rails-ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94.zip |
Merge pull request #3258 from ileitch/3-1-stable
Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
Diffstat (limited to 'activerecord/test/cases/adapters/postgresql')
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/statement_pool_test.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb b/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb index a82c6f67d6..f1c4b85126 100644 --- a/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb +++ b/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb @@ -2,6 +2,16 @@ require 'cases/helper' module ActiveRecord::ConnectionAdapters class PostgreSQLAdapter < AbstractAdapter + class InactivePGconn + def query(*args) + raise PGError + end + + def status + PGconn::CONNECTION_BAD + end + end + class StatementPoolTest < ActiveRecord::TestCase def test_cache_is_per_pid return skip('must support fork') unless Process.respond_to?(:fork) @@ -18,6 +28,12 @@ module ActiveRecord::ConnectionAdapters Process.waitpid pid assert $?.success?, 'process should exit successfully' end + + def test_dealloc_does_not_raise_on_inactive_connection + cache = StatementPool.new InactivePGconn.new, 10 + cache['foo'] = 'bar' + assert_nothing_raised { cache.clear } + end end end end |