diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-04 14:43:40 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-04 14:43:40 -0700 |
| commit | 7443a332a74d7e77f2a4fa2b1e9118da08351121 (patch) | |
| tree | 02a0cb12a14b1888350eb5c258b4150f399b87f2 /activerecord | |
| parent | ac76d551ce1dbb829d521a57a4000b8ce49418f2 (diff) | |
| download | rails-7443a332a74d7e77f2a4fa2b1e9118da08351121.tar.gz rails-7443a332a74d7e77f2a4fa2b1e9118da08351121.tar.bz2 rails-7443a332a74d7e77f2a4fa2b1e9118da08351121.zip | |
Leave internal pgsql name intact as const reference
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |