aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-07-18 13:40:41 -0400
committerGitHub <noreply@github.com>2017-07-18 13:40:41 -0400
commitf47bac481949a69a519ea7d833e1a8d435332d52 (patch)
tree14d42f9bf224df8e3bd3929878d7b4db79e56d89 /activerecord
parent3437810c6a46b33ec239b59ad91e7be4ea7e85c8 (diff)
parent325b3cd6499db1164205198b6e4af90e3d2af865 (diff)
downloadrails-f47bac481949a69a519ea7d833e1a8d435332d52.tar.gz
rails-f47bac481949a69a519ea7d833e1a8d435332d52.tar.bz2
rails-f47bac481949a69a519ea7d833e1a8d435332d52.zip
Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_on_dealloc
Catch postgres connection errors when trying to dealloc
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 8baef19030..66c61b5f4a 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -184,6 +184,7 @@ module ActiveRecord
def dealloc(key)
@connection.query "DEALLOCATE #{key}" if connection_active?
+ rescue PG::Error
end
def connection_active?