Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlocked

The problem isn't the detection but the deadlock itself

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -753,7 +753,7 @@ def translate_exception(exception, message)
         when ER_DATA_TOO_LONG
           ValueTooLong.new(message)
         when ER_LOCK_DEADLOCK
-          DeadlockDetected.new(message)
+          Deadlocked.new(message)
         else
           super
         end

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -422,7 +422,7 @@ def translate_exception(exception, message)
           when SERIALIZATION_FAILURE
             SerializationFailure.new(message)
           when DEADLOCK_DETECTED
-            DeadlockDetected.new(message)
+            Deadlocked.new(message)
           else
             super
           end

activerecord/lib/active_record/errors.rb

@@ -300,9 +300,9 @@ class TransactionRollbackError < StatementInvalid
   class SerializationFailure < TransactionRollbackError
   end
 
-  # DeadlockDetected will be raised when a transaction is rolled
+  # Deadlocked will be raised when a transaction is rolled
   # back by the database when a deadlock is encountered.
-  class DeadlockDetected < TransactionRollbackError
+  class Deadlocked < TransactionRollbackError
   end
 
   # IrreversibleOrderError is raised when a relation's order is too complex for

activerecord/test/cases/adapters/mysql2/transaction_test.rb

@@ -27,8 +27,8 @@ class Sample < ActiveRecord::Base
       @connection.drop_table 'samples', if_exists: true
     end
 
-    test "raises DeadlockDetected when a deadlock is encountered" do
-      assert_raises(ActiveRecord::DeadlockDetected) do
+    test "raises Deadlocked when a deadlock is encountered" do
+      assert_raises(ActiveRecord::Deadlocked) do
         s1 = Sample.create value: 1
         s2 = Sample.create value: 2
 

activerecord/test/cases/adapters/postgresql/transaction_test.rb

@@ -58,9 +58,9 @@ class Sample < ActiveRecord::Base
       end
     end
 
-    test "raises DeadlockDetected when a deadlock is encountered" do
+    test "raises Deadlocked when a deadlock is encountered" do
       with_warning_suppression do
-        assert_raises(ActiveRecord::DeadlockDetected) do
+        assert_raises(ActiveRecord::Deadlocked) do
           s1 = Sample.create value: 1
           s2 = Sample.create value: 2