activerecord-pedantmysql2-adapter 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3edf754b2a2095a7149077c7307326fb63e58851
-  data.tar.gz: e65305e4b6c3f8fb0c682cc890ee010b88405b93
+SHA256:
+  metadata.gz: 5255cb91c19fa45adb1a277a95d8e9113e6f52cd5c76c418bc79025a16724bc2
+  data.tar.gz: 897ba4f42c2e58edff7b6a159d7007c273560a025c813099822c432576ffe473
 SHA512:
-  metadata.gz: 0788ea3fa24672a2b31723dab2fc19cb2b768008515be1d978d19cffa7562d8c988a693770219a64f1380b77a434d22650fda77bb5ec25f3ff9dc0caa1b6f9c2
-  data.tar.gz: b2a18d31f2345eab76fc0f8373a721dd43b81b3c116ca120b9eb52c167330f674babd3d3820875b040fc814bb0f6af096401f4c2effc85a651186b2942406e16
+  metadata.gz: 5a7c36b9b2d2d94b813bd3992878fb97c6ef5052285e0c29f53fcbfe3623047d7c00e0cd5776e013c5b2079a7e114603bc0d8a3dcc0a8ac70a1e0ab11201c754
+  data.tar.gz: 3f25aa8d59e4adc8d5fd6f66905740ce3af5fd55a4373502e7ba5f66a0a39384d4749ebb2e891fd3dffb2913e203c05452ea84e7281a81d1a949bb99da182c04

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    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'
+    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

@@ -26,6 +26,9 @@ Finally in your `database.yml`:
 
     adapter: pedant_mysql2
 
+Or if you're using `DATABASE_URL` or the url key in `database.yml`, you can use the `pedant-mysql2` URL scheme:
+
+    url: pedant-mysql2://host/database
 
 ## Usage
 
@@ -49,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,14 +13,18 @@ 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'

data/gemfiles/Gemfile.activerecord-6.0

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

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-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,23 +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
@@ -37,20 +58,17 @@ class MysqlWarning < StandardError
 end
 
 class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::ConnectionAdapters::Mysql2Adapter
-
-  alias_method :original_execute, :execute
-
-  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)
-    original_execute to_sql(sql, binds), name
-    affected_rows = @connection.affected_rows
-    log_warnings(sql)
-    affected_rows
+    @affected_rows_before_logging = nil
+    value = super
+    @affected_rows_before_logging || value
   end
 
   alias :exec_update :exec_delete
@@ -60,7 +78,9 @@ class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::Conn
   def log_warnings(sql)
     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)
       ::PedantMysql2.warn(warning)

data/lib/pedant_mysql2.rb

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

data/lib/pedant_mysql2/version.rb

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

data/spec/adapter_spec.rb

@@ -7,6 +7,7 @@ describe PedantMysql2 do
   before :each 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)')
@@ -19,8 +20,8 @@ describe PedantMysql2 do
     PedantMysql2.on_warning = @original_callback
   end
 
-  def execute_with_warning
-    ActiveRecord::Base.connection.execute('SELECT 1 + "foo"')
+  def execute_with_warning(query = 'SELECT 1 + "foo"')
+    ActiveRecord::Base.connection.execute(query)
   end
 
   def wait_for(thread)
@@ -42,6 +43,12 @@ describe PedantMysql2 do
     }.to raise_error(MysqlWarning, "Truncated incorrect DOUBLE value: 'foo'")
   end
 
+  it 'does not raise when warning warns about unexisting table' do
+    expect {
+      execute_with_warning('DROP TABLE IF EXISTS `example_table`')
+    }.to_not raise_error
+  end
+
   it 'can have a whitelist of warnings' do
     PedantMysql2.ignore(/Truncated incorrect DOUBLE value/i)
     expect {
@@ -55,13 +62,27 @@ describe PedantMysql2 do
     expect(result.to_a).to be == [[1.0]]
   end
 
-  it 'do not change the returned value of exec_update' do
+  it 'does not change the returned value of exec_update' do
+    connection.execute('INSERT INTO comment VALUES (17)')
     result = connection.update('UPDATE comment SET id = 1 ORDER BY id LIMIT 1')
+    expect(result).to be == 1
+  end
+
+  it 'does not change the returned value of exec_update when there is warnings' do
+    PedantMysql2.silence_warnings!
+    result = connection.update('UPDATE comment SET id = 1 WHERE id > (42+"foo") ORDER BY id LIMIT 1')
     expect(result).to be_zero
   end
 
-  it 'do not change the returned value of exec_delete' do
+  it 'does not change the returned value of exec_delete' do
+    connection.execute('INSERT INTO comment VALUES (17)')
     result = connection.delete('DELETE FROM comment ORDER BY id LIMIT 1')
+    expect(result).to be == 1
+  end
+
+  it 'does not change the returned value of exec_delete when there is warnings' do
+    PedantMysql2.silence_warnings!
+    result = connection.delete('DELETE FROM comment WHERE id > (42+"foo") ORDER BY id LIMIT 1')
     expect(result).to be_zero
   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

@@ -4,14 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rspec/its'
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   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' => 'utf8',
+    '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,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pedantmysql2-adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
-  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
-  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
-  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
-  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
-  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
-  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
-  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
-  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
-  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
-  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
-  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
-  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
-  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
-  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
-  TConQSX2BnZdhIEYW+cKzEC/bLc=
-  -----END CERTIFICATE-----
-date: 2015-03-30 00:00:00.000000000 Z
+cert_chain: []
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,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
@@ -64,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
@@ -138,23 +116,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
-- Gemfile.activerecord32
-- Gemfile.activerecord40
-- Gemfile.activerecord41
-- Gemfile.activerecord42
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-pedantmysql2-adapter.gemspec
+- gemfiles/Gemfile.activerecord-6.0
+- gemfiles/Gemfile.activerecord-6.1
+- 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
@@ -162,7 +138,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:
@@ -171,15 +148,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.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for MySQL that report warnings.

data/.travis.yml

@@ -1,15 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-
-gemfile:
-  - Gemfile.activerecord32
-  - Gemfile.activerecord40
-  - Gemfile.activerecord41
-  - Gemfile.activerecord42
-
-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/shipit.rubygems.yml

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

metadata.gz.sig

@@ -1,2 +0,0 @@
-��9AB{ż��3�s΂a�\NC�DxHAh�8B������(��b��¢`���V�X�/AvD�3�������??��
-��g�Xl��Ags�?w�֓�*�����uɥX��px`����c6�M�6���ƞ#N��\S֋��x����Û=:l��D����]m����$-�W<����t��.:hoX�JҠlGur�c.�2_������qqD��b���"ЛSV��i�̜
$��W�Cd�O�Y�K�.��M}�Nw�e