activerecord-pedantmysql2-adapter 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5255cb91c19fa45adb1a277a95d8e9113e6f52cd5c76c418bc79025a16724bc2
-  data.tar.gz: 897ba4f42c2e58edff7b6a159d7007c273560a025c813099822c432576ffe473
+  metadata.gz: edb5734c15054a4f6e3d985cad3bf2932cb923d5c3c9f9daa0e846dd43a587a6
+  data.tar.gz: 70c44fec9acff6556b13729d54e2004bbe98653975d11b69654bb99b3ffd9d62
 SHA512:
-  metadata.gz: 5a7c36b9b2d2d94b813bd3992878fb97c6ef5052285e0c29f53fcbfe3623047d7c00e0cd5776e013c5b2079a7e114603bc0d8a3dcc0a8ac70a1e0ab11201c754
-  data.tar.gz: 3f25aa8d59e4adc8d5fd6f66905740ce3af5fd55a4373502e7ba5f66a0a39384d4749ebb2e891fd3dffb2913e203c05452ea84e7281a81d1a949bb99da182c04
+  metadata.gz: f21453993e5cbe025c65e876de54bedb53082db01ff5551da0e17b902faa48f37fff20cd3e49ec5920038a835339d4e36de0d9570bfe925d4e5577c14c402862
+  data.tar.gz: 830f4252036dd996c2ce76dd6d8f624d324854c27382bc706a8efa2c85c5d080b0dd8f187a4c3654f8e8932128e3f30ecf183573554f181bdcd9ff580e3a9292

data/.github/workflows/ci.yml

@@ -8,11 +8,8 @@ jobs:
     name: Ruby ${{ matrix.ruby }} / Active Record ${{ matrix.activerecord }}
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
-        activerecord: ['6.0', '6.1', 'edge']
-        exclude:
-          - ruby: '2.6'
-            activerecord: 'edge'
+        ruby: ['2.7', '3.0', '3.1']
+        activerecord: ['6.1', '7.0', 'edge']
     env:
       BUNDLE_GEMFILE: gemfiles/Gemfile.activerecord-${{ matrix.activerecord }}
     steps:

data/activerecord-pedantmysql2-adapter.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 6.0'
   spec.add_dependency 'mysql2', '>= 0.3.12'
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'coveralls'
 end

data/gemfiles/{Gemfile.activerecord-6.0 → Gemfile.activerecord-7.0}

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gemspec path: '..'
 
-gem 'activerecord', '~> 6.0.0'
+gem 'activerecord', '~> 7.0.0'
 gem 'mysql2'

data/lib/active_record/connection_adapters/pedant_mysql2_adapter.rb

@@ -76,10 +76,13 @@ class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::Conn
   private
 
   def log_warnings(sql)
-    return unless @connection.warning_count > 0
+    # support for https://github.com/rails/rails/commit/d86fd6415c0dfce6fadb77e74696cf728e5eb76b
+    connection = instance_variable_defined?(:@raw_connection) ? @raw_connection : @connection
 
-    @affected_rows_before_logging = @connection.affected_rows
-    result = @connection.query('SHOW WARNINGS')
+    return unless connection.warning_count > 0
+
+    @affected_rows_before_logging = connection.affected_rows
+    result = connection.query('SHOW WARNINGS')
 
     result.each do |level, code, message|
       warning = MysqlWarning.new(message, code, level, sql)

data/lib/pedant_mysql2/version.rb

@@ -1,3 +1,3 @@
 module PedantMysql2
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/pedant_mysql2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PedantMysql2
   class << self
     def capture_warnings
@@ -46,11 +48,11 @@ module PedantMysql2
     end
 
     def ignored?(warning)
-      whitelist.any? { |matcher| warning.message.match?(matcher) } || drop_table_warning(warning)
+      note_warning?(warning) || whitelist.any? { |matcher| warning.message.match?(matcher) }
     end
 
-    def drop_table_warning(warning)
-      warning.query.match?(/\ADROP TABLE IF EXISTS/) || warning.message.match?(/\AUnknown table/)
+    def note_warning?(warning)
+      warning.level == "Note"
     end
 
     def setup_capture

data/spec/adapter_spec.rb

@@ -8,7 +8,6 @@ describe PedantMysql2 do
     PedantMysql2.raise_warnings!
     PedantMysql2.instance_variable_set(:@whitelist, nil)
     PedantMysql2.ignore(/They will be merged with strict mode in a future release/)
-    connection.execute('SET SESSION binlog_format = "STATEMENT"')
     if connection.execute('SHOW TABLES LIKE "comment"').size == 0
       connection.execute('CREATE TABLE comment (id int)')
     end
@@ -43,12 +42,18 @@ describe PedantMysql2 do
     }.to raise_error(MysqlWarning, "Truncated incorrect DOUBLE value: 'foo'")
   end
 
-  it 'does not raise when warning warns about unexisting table' do
+  it 'does not raise when warning is a Note level warning e.g. unexisting table' do
     expect {
       execute_with_warning('DROP TABLE IF EXISTS `example_table`')
     }.to_not raise_error
   end
 
+  it 'does not raise when warning is a Note level warning e.g. EXPLAIN queries' do
+    expect {
+      execute_with_warning('EXPLAIN SELECT 1')
+    }.to_not raise_error
+  end
+
   it 'can have a whitelist of warnings' do
     PedantMysql2.ignore(/Truncated incorrect DOUBLE value/i)
     expect {

data/spec/spec_helper.rb

@@ -2,14 +2,6 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'rspec/its'
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
-SimpleCov.start
-
 require 'activerecord-pedantmysql2-adapter'
 
 module TestSupport
@@ -18,7 +10,7 @@ module TestSupport
     'database' => 'pedant_mysql2_test',
     'username' => 'root',
     'password' => ENV['CI'] ? 'root' : nil,
-    'encoding' => 'utf8',
+    'encoding' => 'utf8mb4',
     'host' => 'localhost',
     'strict' => false,
     'pool' => 5,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pedantmysql2-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 description: Gives a hook on MySQL warnings that allow you to either raise or log
   them.
 email:
@@ -124,8 +110,8 @@ files:
 - README.md
 - Rakefile
 - activerecord-pedantmysql2-adapter.gemspec
-- gemfiles/Gemfile.activerecord-6.0
 - gemfiles/Gemfile.activerecord-6.1
+- gemfiles/Gemfile.activerecord-7.0
 - gemfiles/Gemfile.activerecord-edge
 - lib/active_record/connection_adapters/pedant_mysql2_adapter.rb
 - lib/activerecord-pedantmysql2-adapter.rb
@@ -155,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL that report warnings.