Support Ruby 3.2, 3.3 and Rails 7.1

.github/workflows/test.yml

@@ -17,13 +17,19 @@ jobs:
           - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
+          - '3.3'
         activerecord-version:
-          - '6'
-          - '7'
+          - '6_0'
+          - '6_1'
+          - '7_0'
+          - '7_1'
         exclude:
-          - # activerecord-7 doesn't support Ruby 2.6
-            ruby-version: '2.6'
-            activerecord-version: '7'
+          # activerecord-7 doesn't support Ruby 2.6
+          - ruby-version: '2.6'
+            activerecord-version: '7_0'
+          - ruby-version: '2.6'
+            activerecord-version: '7_1'
 
     services:
       mysql:

gemfiles/activerecord_6_0.gemfile

@@ -0,0 +1,2 @@
+eval_gemfile("../Gemfile")
+gem "activerecord", "~> 6.0.0"

gemfiles/activerecord_6_1.gemfile

@@ -0,0 +1,2 @@
+eval_gemfile("../Gemfile")
+gem "activerecord", "~> 6.1.0"

gemfiles/activerecord_7_0.gemfile

@@ -0,0 +1,2 @@
+eval_gemfile("../Gemfile")
+gem "activerecord", "~> 7.0.0"

gemfiles/activerecord_7_1.gemfile

@@ -0,0 +1,2 @@
+eval_gemfile("../Gemfile")
+gem "activerecord", "~> 7.1.0"

lib/activerecord/debug_errors/ext/connection_adapters/abstract_mysql_adapter.rb

@@ -4,32 +4,54 @@
 module ActiveRecord
   module DebugErrors
     module DisplayMySQLInformation
-      # Rails 7 or later never calls ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter#execute
-      # cf. https://github.com/rails/rails/pull/43097
-      if ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.private_method_defined?(:raw_execute)
-        method_name = :raw_execute
-      else
-        method_name = :execute
+      # For Rails 6.0, 6.1, 7.0.
+      if ActiveRecord.version < Gem::Version.new("7.1.0")
+        # Rails 7 or later never calls ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter#execute
+        # cf. https://github.com/rails/rails/pull/43097
+        if ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.private_method_defined?(:raw_execute)
+          method_name = :raw_execute
+        else
+          method_name = :execute
+        end
+        define_method(method_name) do |*args, **kwargs|
+          super(*args, **kwargs)
+        rescue ActiveRecord::Deadlocked
+          handle_deadlocked
+          raise
+        rescue ActiveRecord::LockWaitTimeout
+          handle_lock_wait_timeout
+          raise
+        end
+        private method_name if method_name == :raw_execute
+      elsif ActiveRecord.version >= Gem::Version.new("7.1.0")
+        # For Rails 7.1 or later. Override `ActiveRecord::ConnectionAdapters::AbstractAdapter#translate_exception_class`
+        # so that it obtains an error happened on query executions.
+        private def translate_exception_class(*args, **kwargs)
+          if  args[0].is_a?(ActiveRecord::Deadlocked)
+            handle_deadlocked
+          elsif args[0].is_a?(ActiveRecord::LockWaitTimeout)
+            handle_lock_wait_timeout
+          end
+          super(*args, **kwargs)
+        end
       end
-      define_method(method_name) do |*args, **kwargs|
-        super(*args, **kwargs)
-      rescue ActiveRecord::Deadlocked
+
+      private
+
+      def handle_deadlocked
         if logger
           logger.error "ActiveRecord::Deadlocked occurred:"
           display_latest_detected_deadlock
         end
-        raise
-      rescue ActiveRecord::LockWaitTimeout
+      end
+
+      def handle_lock_wait_timeout
         if logger
           logger.error "ActiveRecord::LockWaitTimeout occurred:"
           display_transactions
           display_processlist
         end
-        raise
       end
-      private method_name if method_name == :raw_execute
-
-      private
 
       def display_latest_detected_deadlock
         display_innodb_status_section("LATEST DETECTED DEADLOCK")

spec/activerecord/debug_errors/ext/connection_adapters/connection_pool_spec.rb

@@ -18,13 +18,16 @@
 
   describe "#acquire_connection" do
     it "displays connection owners and other threads" do
+      ActiveRecord::Base.connection_pool.checkout_timeout = 0.001 # no need to delay test suite by waiting the whole full default timeout
+
       Thread.new { sleep 10 } # another thread
 
       expect {
         ActiveRecord::Base.connection # Ensure to acquire a connection
         Array.new(ActiveRecord::Base.connection_pool.size) do
           Thread.new do
-            ActiveRecord::Base.connection_pool.checkout(0.1)
+            ActiveRecord::Base.connection_pool.checkout
+            sleep 0.001
           end
         end.each(&:join)
       }.to raise_error(ActiveRecord::ConnectionTimeoutError)

spec/spec_helper.rb

@@ -26,7 +26,11 @@
     }
 
     user_for_replica = 'activerecord-debug_errors'
-    ActiveRecord::Base.legacy_connection_handling = false
+    # For compatibility. Rails deprecated since 6.1 and removed this option since 7.1.
+    # https://github.com/rails/rails/pull/44827/commits/ad52c0a19714a1b87a7d0c626a8b364cf95414cf
+    if ActiveRecord::Base.respond_to?(:legacy_connection_handling)
+      ActiveRecord::Base.legacy_connection_handling = false
+    end
     ActiveRecord::Base.configurations = {
       default_env: {
         primary: base_db_config,