activerecord-debug_errors 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818e63536312d27e39718e58eb6ec33827cd703e245f284c806e53d4dfcc86dc
-  data.tar.gz: b177c2624722f1a5bd01f5378c252c6344d134679704f2e816ccbf2b184732f7
+  metadata.gz: da91d2ad33b30bd8ac659196f3e45ffbb216718202955b9edec862eeb3657595
+  data.tar.gz: 5cff1fcd45f2728651aa0be40858d17491f558a6530d8d71ef1352cb70efd6e8
 SHA512:
-  metadata.gz: 2198d3f0a7a61a1d71f1c171c8fa9aaa1a4a7f650ae40fb69c39bf95f37ed83aa3d0c125b2beaa2032cac1a7ec05938607448b3266a399e79bd774476dd69610
-  data.tar.gz: d6a9a8df96bff2a512468e3c56ce07099a2eee6818a9adef13422d832bb1b22cb2dadc0450b960f0ed244d6d21223453e3fd957fac67816fc4c0ba1770de0943
+  metadata.gz: 7a982545c7b10fffd01a3ffd3f246f0a0af53a31f9b1eacbe64a18861963c2bce24c6683af8eefae1a8f12e3b66fc26d09b15deef54ac17c3c1ccbfac01e4109
+  data.tar.gz: 2ee8488020bda34d7d60dca2768ce46c15dce41208651174f9bdc8d17c77b94e6d4d26d5171981eaa718e31753839fd40c0aa58a9ba2f6015982a7845e1059bd

data/.github/workflows/test.yml

@@ -15,6 +15,16 @@ jobs:
         ruby-version:
           - '2.6'
           - '2.7'
+          - '3.0'
+          - '3.1'
+        activerecord-version:
+          - '6'
+          - '7'
+        exclude:
+          - # activerecord-7 doesn't support Ruby 2.6
+            ruby-version: '2.6'
+            activerecord-version: '7'
+
     services:
       mysql:
         image: mysql:5.7
@@ -28,18 +38,17 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: test
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.activerecord-version }}.gemfile
+
     steps:
       - uses: actions/checkout@v2
       - 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,6 +118,8 @@ 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):

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.gemfile

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

data/gemfiles/activerecord_7.gemfile

@@ -0,0 +1,2 @@
+eval_gemfile("../Gemfile")
+gem "activerecord", "~> 7.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,6 @@ module ActiveRecord
   end
 end
 
-require "active_record/connection_adapters/abstract_mysql_adapter"
 class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
   prepend ActiveRecord::DebugErrors::DisplayMySQLInformation
 end

data/lib/activerecord/debug_errors/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DebugErrors
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   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.2
 platform: ruby
 authors:
 - abicky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2022-01-19 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,8 @@ files:
 - activerecord-debug_errors.gemspec
 - bin/console
 - bin/setup
+- gemfiles/activerecord_6.gemfile
+- gemfiles/activerecord_7.gemfile
 - lib/activerecord-debug_errors.rb
 - lib/activerecord/debug_errors.rb
 - lib/activerecord/debug_errors/ext/connection_adapters/abstract_mysql_adapter.rb
@@ -73,7 +61,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 +76,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.2.22
+signing_key:
 specification_version: 4
 summary: An extension of activerecord to display useful debug logs on errors
 test_files: []