activerecord-pedantmysql2-adapter 1.1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb193accc432a0fed85a527c520afef1f5bf3c43
-  data.tar.gz: b11fe06882e5086459d26f52cd59bcfb6ead0327
+SHA256:
+  metadata.gz: '0191edcf1291b66b644b0ee2aae2c192559dda880347270f4bac423ff0dae468'
+  data.tar.gz: ddbb36a60520e44f314416fbfac0bbef65cd89c7f2b6f7ecd0c13468c6a9d9d9
 SHA512:
-  metadata.gz: e8146d26e36fa99f37a3c08277da4db95210a3fabc0ad6764dde8de9cefa3751ac1a4f79ee97733cc058ab704878100459c7dc3f5c95b612c803c5a16b5f1fd8
-  data.tar.gz: f950e21b77652402beb3ebd2e7d5786f59f47d97a1568120d7fe19e6b9a84abccdb0fb9f4c53ff0c3eae82f2b4222ebf6a2fab5198128bd69343824c15150027
+  metadata.gz: 70a10d0462324fddae3d76bc4e74fb0f62b7db8f4a65c3153ce7b5ce03b897ce7587ea402122a5b2226abf6412c9aa4367c2316f82bb1c7589548a582de24cbd
+  data.tar.gz: 90050a09ffec4d32945213f19360a11f3b993ef858806f465d57822d4dadb5d57281d84d60b46fac2a16a16b29b0d11bf77d344bbd213124b00c910e697fae48

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} / Active Record ${{ matrix.activerecord }}
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.0', '3.1']
+        activerecord: ['6.1', '7.0', 'edge']
+    env:
+      BUNDLE_GEMFILE: gemfiles/Gemfile.activerecord-${{ matrix.activerecord }}
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Start MySQL and create DB
+      run: |
+        sudo systemctl start mysql.service
+        mysql -uroot -proot -e 'create database pedant_mysql2_test;'
+    - name: Ruby Tests
+      run: bundle exec rake

data/README.md

@@ -52,7 +52,7 @@ and to restore it to raising warnings as errors:
   PedantMysql2.raise_warnings!
 ```
 
-You can easilly whitelist some types of warnings:
+You can easily whitelist some types of warnings:
 
 ```ruby
 PedantMysql2.ignore(/Some warning I don't care about/i)

data/activerecord-pedantmysql2-adapter.gemspec

@@ -13,16 +13,20 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/Shopify/activerecord-pedantmysql2-adapter'
   spec.license       = 'MIT'
 
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.required_ruby_version = '>= 2.2.2'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 3.2'
+  spec.add_dependency 'activerecord', '>= 6.0'
   spec.add_dependency 'mysql2', '>= 0.3.12'
-  spec.add_development_dependency 'bundler', '~> 1.5'
+
+  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.1

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

data/gemfiles/Gemfile.activerecord-7.0

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

data/gemfiles/Gemfile.activerecord-edge

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activerecord', github: 'rails/rails', branch: 'main'

data/lib/active_record/connection_adapters/pedant_mysql2_adapter.rb

@@ -2,24 +2,44 @@ require 'active_record/connection_adapters/mysql2_adapter'
 
 module ActiveRecord
   module ConnectionHandling
-    def pedant_mysql2_connection(config)
-      config = config.symbolize_keys
-
-      config[:username] = 'root' if config[:username].nil?
-
-      if Mysql2::Client.const_defined? :FOUND_ROWS
-        config[:flags] = Mysql2::Client::FOUND_ROWS
+    if ConnectionAdapters::Mysql2Adapter.respond_to?(:new_client)
+      def pedant_mysql2_connection(config)
+        config = config.symbolize_keys
+        config[:flags] ||= 0
+
+        if config[:flags].kind_of? Array
+          config[:flags].push "FOUND_ROWS"
+        else
+          config[:flags] |= Mysql2::Client::FOUND_ROWS
+        end
+
+        ConnectionAdapters::PedantMysql2Adapter.new(
+          ConnectionAdapters::Mysql2Adapter.new_client(config),
+          logger,
+          nil,
+          config,
+        )
       end
-
-      client = Mysql2::Client.new(config)
-
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ActiveRecord::ConnectionAdapters::PedantMysql2Adapter.new(client, logger, options, config)
-    rescue Mysql2::Error => error
-      if error.message.include?("Unknown database") && defined?(ActiveRecord::NoDatabaseError)
-        raise ActiveRecord::NoDatabaseError.new(error.message)
-      else
-        raise
+    else
+      def pedant_mysql2_connection(config)
+        config = config.symbolize_keys
+
+        config[:username] = 'root' if config[:username].nil?
+
+        if Mysql2::Client.const_defined? :FOUND_ROWS
+          config[:flags] = Mysql2::Client::FOUND_ROWS
+        end
+
+        client = Mysql2::Client.new(config)
+
+        options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+        ActiveRecord::ConnectionAdapters::PedantMysql2Adapter.new(client, logger, options, config)
+      rescue Mysql2::Error => error
+        if error.message.include?("Unknown database") && defined?(ActiveRecord::NoDatabaseError)
+          raise ActiveRecord::NoDatabaseError.new(error.message)
+        else
+          raise
+        end
       end
     end
   end
@@ -38,11 +58,12 @@ class MysqlWarning < StandardError
 end
 
 class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  def execute(sql, name = nil)
+  def execute(sql, *)
     value = super
     log_warnings(sql)
     value
   end
+  ruby2_keywords :execute if respond_to?(:ruby2_keywords, true)
 
   def exec_delete(sql, name, binds)
     @affected_rows_before_logging = nil
@@ -55,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
+
+    return unless connection.warning_count > 0
 
-    @affected_rows_before_logging = @connection.affected_rows
-    result = @connection.query('SHOW WARNINGS')
+    @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.1.3'
+  VERSION = '1.3.1'
 end

data/lib/pedant_mysql2.rb

@@ -46,11 +46,11 @@ module PedantMysql2
     end
 
     def ignored?(warning)
-      whitelist.any? { |matcher| matcher =~ warning.message } || drop_table_warning(warning)
+      whitelist.any? { |matcher| warning.message.match?(matcher) } || drop_table_warning(warning)
     end
 
     def drop_table_warning(warning)
-      warning.query =~ /\ADROP TABLE IF EXISTS/ || warning.message =~ /\AUnknown table/
+      warning.query.match?(/\ADROP TABLE IF EXISTS/) || warning.message.match?(/\AUnknown table/)
     end
 
     def setup_capture

data/spec/adapter_spec.rb

@@ -7,7 +7,7 @@ describe PedantMysql2 do
   before :each do
     PedantMysql2.raise_warnings!
     PedantMysql2.instance_variable_set(:@whitelist, nil)
-    connection.execute('SET SESSION binlog_format = "STATEMENT"')
+    PedantMysql2.ignore(/They will be merged with strict mode in a future release/)
     if connection.execute('SHOW TABLES LIKE "comment"').size == 0
       connection.execute('CREATE TABLE comment (id int)')
     end

data/spec/connection_spec.rb

@@ -12,7 +12,12 @@ describe ActiveRecord::ConnectionHandling do
   it 'raises NoDatabaseError correctly' do
     error_class = defined?(ActiveRecord::NoDatabaseError) ? ActiveRecord::NoDatabaseError : Mysql2::Error
     expect {
-      Mock.new.pedant_mysql2_connection({host: 'localhost', database: 'nosuchthing'})
+      Mock.new.pedant_mysql2_connection({
+        host: TestSupport::DB_CONFIG['hostname'],
+        username: TestSupport::DB_CONFIG['username'],
+        password: TestSupport::DB_CONFIG['password'],
+        database: 'nosuchthing',
+      })
     }.to raise_error(error_class)
   end
 

data/spec/spec_helper.rb

@@ -2,16 +2,23 @@ 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[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start
-
 require 'activerecord-pedantmysql2-adapter'
 
+module TestSupport
+  DB_CONFIG = {
+    'adapter' => 'pedant_mysql2',
+    'database' => 'pedant_mysql2_test',
+    'username' => 'root',
+    'password' => ENV['CI'] ? 'root' : nil,
+    'encoding' => 'utf8mb4',
+    'host' => 'localhost',
+    'strict' => false,
+    'pool' => 5,
+  }.freeze
+end
+
+ActiveRecord::Base.establish_connection(TestSupport::DB_CONFIG)
+
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
 RSpec.configure do |config|

data/spec/support/database.rb

@@ -1,11 +0,0 @@
-ActiveRecord::Base.configurations = {
-  'test' => {
-    adapter: 'pedant_mysql2',
-    database: 'pedant_mysql2_test',
-    username: 'travis',
-    encoding: 'utf8',
-    strict: false,
-    pool: 5,
-  },
-}
-ActiveRecord::Base.establish_connection(:test)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pedantmysql2-adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -116,24 +102,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
-- Gemfile.activerecord32
-- Gemfile.activerecord40
-- Gemfile.activerecord41
-- Gemfile.activerecord42
-- Gemfile.activerecord50
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-pedantmysql2-adapter.gemspec
+- 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
 - lib/pedant_mysql2.rb
 - lib/pedant_mysql2/version.rb
-- shipit.rubygems.yml
 - spec/adapter_spec.rb
 - spec/connection_spec.rb
 - spec/spec_helper.rb
@@ -141,7 +124,8 @@ files:
 homepage: https://github.com/Shopify/activerecord-pedantmysql2-adapter
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,15 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL that report warnings.

data/.travis.yml

@@ -1,27 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - 2.2.2
-  - 2.3.0
-
-gemfile:
-  - Gemfile.activerecord32
-  - Gemfile.activerecord40
-  - Gemfile.activerecord41
-  - Gemfile.activerecord42
-  - Gemfile.activerecord50
-
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile.activerecord50
-    - rvm: 2.0.0
-      gemfile: Gemfile.activerecord50
-    - rvm: 2.1.2
-      gemfile: Gemfile.activerecord50
-
-before_script:
-  - mysql -e 'create database pedant_mysql2_test;'
-
-sudo: false

data/Gemfile.activerecord32

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 3.2.0'

data/Gemfile.activerecord40

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.0.0'

data/Gemfile.activerecord41

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.1.0'

data/Gemfile.activerecord42

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.2.0.rc1'

data/Gemfile.activerecord50

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 5.0.0'

data/shipit.rubygems.yml

@@ -1,2 +0,0 @@
-fetch:
-  - fetch-gem-version activerecord-pedantmysql2-adapter Shopify/activerecord-pedantmysql2-adapter