activerecord-debug_errors 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818e63536312d27e39718e58eb6ec33827cd703e245f284c806e53d4dfcc86dc
-  data.tar.gz: b177c2624722f1a5bd01f5378c252c6344d134679704f2e816ccbf2b184732f7
+  metadata.gz: e5e73679ce896b569f923bc47533917baeaed89312248d578e72ac18187ac0d7
+  data.tar.gz: 5374c129a058bdb852b294649d14065f8c61de94527335ececbaf17ec9423a5d
 SHA512:
-  metadata.gz: 2198d3f0a7a61a1d71f1c171c8fa9aaa1a4a7f650ae40fb69c39bf95f37ed83aa3d0c125b2beaa2032cac1a7ec05938607448b3266a399e79bd774476dd69610
-  data.tar.gz: d6a9a8df96bff2a512468e3c56ce07099a2eee6818a9adef13422d832bb1b22cb2dadc0450b960f0ed244d6d21223453e3fd957fac67816fc4c0ba1770de0943
+  metadata.gz: 23fa53f6de23fc3310235626e16e2f883abbae22ef12db578aa572c0e29b7b13352cc97ef0ae5275b5c8a456b8b33533ee86694a3aba3b02498ada252ad18cc7
+  data.tar.gz: 49e1c9ed26875868ab6b834104a29d383eab2cccfabd9e053c3cd4ffbfdede095f430d3d2fb2fd4a9c5fa3b9153f40f30d9773f2333842a8f79a9bb83066492d

data/.github/workflows/test.yml

@@ -15,6 +15,22 @@ jobs:
         ruby-version:
           - '2.6'
           - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+        activerecord-version:
+          - '6_0'
+          - '6_1'
+          - '7_0'
+          - '7_1'
+        exclude:
+          # 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:
         image: mysql:5.7
@@ -28,18 +44,17 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: test
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.activerecord-version }}.gemfile
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ matrix.ruby-version }}-${{ hashFiles('activerecord-debug_errors.gemspec', '**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-${{ matrix.ruby-version }}-
+          bundler-cache: true
       - name: Build and test with Rake
         run: |
           bundle config path vendor/bundle

data/.gitignore

@@ -7,5 +7,7 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+
 # rspec failure tracking
 .rspec_status

data/Gemfile

@@ -3,5 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-debug_errors.gemspec
 gemspec
 
+gem "mysql2"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"

data/README.md

@@ -118,12 +118,14 @@ Record lock, heap no 2 PHYSICAL RECORD: n_fields 2; compact format; info bits 0
 *** WE ROLL BACK TRANSACTION (2)
 ```
 
+Note that the user requires the PROCESS priviledge to collect the information.
+
 ### ActiveRecord::ConnectionTimeoutError
 
 When `ActiveRecord::ConnectionTimeoutError` occurs, you can see the information of connection owners (threads):
 
 ```
-ActiveRecord::ConnectionTimeoutError occured:
+ActiveRecord::ConnectionTimeoutError occurred:
   connection owners:
     Thread #<Thread:0x00007fbda205fa70 sleep_forever> status=sleep priority=0
         /path/to/activerecord-debug_errors/spec/activerecord/debug_errors/ext/connection_adapters/connection_pool_spec.rb:32:in `join'

data/activerecord-debug_errors.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", ">= 6", "< 7"
-  spec.add_development_dependency "mysql2"
+  spec.add_runtime_dependency "activerecord", ">= 6", "< 8"
 end

data/gemfiles/activerecord_6_0.gemfile

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

data/gemfiles/activerecord_6_1.gemfile

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

data/gemfiles/activerecord_7_0.gemfile

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

data/gemfiles/activerecord_7_1.gemfile

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

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

@@ -1,10 +1,18 @@
 # frozen_string_literal: true
+require "active_record/connection_adapters/abstract_mysql_adapter"
 
 module ActiveRecord
   module DebugErrors
     module DisplayMySQLInformation
-      def execute(*args)
-        super
+      # 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
         if logger
           logger.error "ActiveRecord::Deadlocked occurred:"
@@ -19,6 +27,7 @@ module ActiveRecord
         end
         raise
       end
+      private method_name if method_name == :raw_execute
 
       private
 
@@ -40,7 +49,14 @@ module ActiveRecord
       end
 
       def display_innodb_status_section(section_name)
-        status = ActiveRecord::Base.connection.execute("SHOW ENGINE INNODB STATUS").first[2]
+        sql = "SHOW ENGINE INNODB STATUS"
+        status = nil
+        begin
+          status = ActiveRecord::Base.connection.execute(sql).first[2]
+        rescue ActiveRecord::StatementInvalid => e
+          logger.error "Failed to execute '#{sql}': #{e.message}"
+          return
+        end
 
         prev_line = nil
         in_deadlock_section = false
@@ -64,7 +80,13 @@ module ActiveRecord
   end
 end
 
-require "active_record/connection_adapters/abstract_mysql_adapter"
+ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.descendants.each do |adapter|
+  adapter.prepend(ActiveRecord::DebugErrors::DisplayMySQLInformation)
+end
+
 class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-  prepend ActiveRecord::DebugErrors::DisplayMySQLInformation
+  def self.inherited(base)
+    super
+    base.prepend(ActiveRecord::DebugErrors::DisplayMySQLInformation)
+  end
 end

data/lib/activerecord/debug_errors/ext/connection_adapters/connection_pool.rb

@@ -15,7 +15,7 @@ module ActiveRecord
       def dump_threads
         logger = ActiveRecord::Base.logger
 
-        logger.error "ActiveRecord::ConnectionTimeoutError occured:"
+        logger.error "ActiveRecord::ConnectionTimeoutError occurred:"
 
         dump_thread = ->(thread) {
           logger.error "    Thread #{thread} status=#{thread.status} priority=#{thread.priority}"

data/lib/activerecord/debug_errors/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DebugErrors
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-debug_errors
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - abicky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2024-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,7 @@ dependencies:
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
 description: ActiveRecord::DebugErrors is an extension of activerecord to display
   useful debug logs on errors.
 email:
@@ -62,6 +48,10 @@ files:
 - activerecord-debug_errors.gemspec
 - bin/console
 - bin/setup
+- gemfiles/activerecord_6_0.gemfile
+- gemfiles/activerecord_6_1.gemfile
+- gemfiles/activerecord_7_0.gemfile
+- gemfiles/activerecord_7_1.gemfile
 - lib/activerecord-debug_errors.rb
 - lib/activerecord/debug_errors.rb
 - lib/activerecord/debug_errors/ext/connection_adapters/abstract_mysql_adapter.rb
@@ -73,7 +63,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/abicky/activerecord-debug_errors
   source_code_uri: https://github.com/abicky/activerecord-debug_errors
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: An extension of activerecord to display useful debug logs on errors
 test_files: []