From 7443a332a74d7e77f2a4fa2b1e9118da08351121 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 4 Aug 2016 14:43:40 -0700 Subject: Leave internal pgsql name intact as const reference --- .../lib/active_record/connection_adapters/postgresql_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index d8a50ca96a..8a1fdc9f92 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -407,7 +407,7 @@ module ActiveRecord FOREIGN_KEY_VIOLATION = "23503" UNIQUE_VIOLATION = "23505" SERIALIZATION_FAILURE = "40001" - DEADLOCKED = "40P01" + DEADLOCK_DETECTED = "40P01" def translate_exception(exception, message) return exception unless exception.respond_to?(:result) @@ -421,7 +421,7 @@ module ActiveRecord ValueTooLong.new(message) when SERIALIZATION_FAILURE SerializationFailure.new(message) - when DEADLOCKED + when DEADLOCK_DETECTED Deadlocked.new(message) else super -- cgit v1.2.3