Merge pull request #25107 from Erol/introduce-new-ar-transaction-error-classes

Introduce new ActiveRecord transaction error classes

Closes #26018

1 files changed, 12 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
index 26146dbce7..3f75ce4099 100644
--- a/activerecord/lib/active_record/errors.rb
+++ b/activerecord/lib/active_record/errors.rb
@@ -285,14 +285,24 @@ module ActiveRecord
   class TransactionIsolationError < ActiveRecordError
   end
 
-  # TransactionSerializationError will be raised when a transaction is rolled
+  # TransactionRollbackError will be raised when a transaction is rolled
   # back by the database due to a serialization failure or a deadlock.
   #
   # See the following:
   #
   # * http://www.postgresql.org/docs/current/static/transaction-iso.html
   # * https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_lock_deadlock
-  class TransactionSerializationError < StatementInvalid
+  class TransactionRollbackError < StatementInvalid
+  end
+
+  # SerializationFailure will be raised when a transaction is rolled
+  # back by the database due to a serialization failure.
+  class SerializationFailure < TransactionRollbackError
+  end
+
+  # DeadlockDetected will be raised when a transaction is rolled
+  # back by the database when a deadlock is encountered.
+  class DeadlockDetected < TransactionRollbackError
   end
 
   # IrreversibleOrderError is raised when a relation's order is too complex for