activerecord-pedantmysql2-adapter 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cdc8bc77345e0ed3428828757da42af2180846edbb81327efbad5a0ab28a48e
-  data.tar.gz: 6e90b36c37754b0accdaac56ff69d125b61262f7d79be7884fa79afd835dc010
+  metadata.gz: 5255cb91c19fa45adb1a277a95d8e9113e6f52cd5c76c418bc79025a16724bc2
+  data.tar.gz: 897ba4f42c2e58edff7b6a159d7007c273560a025c813099822c432576ffe473
 SHA512:
-  metadata.gz: 20edfa621dd97dbd80a2b3a5cc3f31711a85074228a5a848b4bc9c987ace3e5d92ad979995560b220526e572aea9f6c3e586e89825e8386fbab6bb4d68578a72
-  data.tar.gz: 79fa48c21ae537ef22c88692c59ea5eaa6332953bc68f3666134373043b1eeb4d1e1e86160b4a7cb6442a0bf757cd9af206026da145460c9c9058ab75b417ec2
+  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/activerecord-pedantmysql2-adapter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 5.0'
+  spec.add_dependency 'activerecord', '>= 6.0'
   spec.add_dependency 'mysql2', '>= 0.3.12'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/gemfiles/{Gemfile.activerecord52 → Gemfile.activerecord-6.1}

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

data/gemfiles/Gemfile.activerecord-edge

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

data/lib/active_record/connection_adapters/pedant_mysql2_adapter.rb

@@ -58,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

data/lib/pedant_mysql2/version.rb

@@ -1,3 +1,3 @@
 module PedantMysql2
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 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,9 +0,0 @@
-ActiveRecord::Base.establish_connection(
-  'adapter' => 'pedant_mysql2',
-  'database' => 'pedant_mysql2_test',
-  'username' => 'root',
-  'encoding' => 'utf8',
-  '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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -116,17 +116,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-pedantmysql2-adapter.gemspec
+- gemfiles/Gemfile.activerecord-6.0
+- gemfiles/Gemfile.activerecord-6.1
 - gemfiles/Gemfile.activerecord-edge
-- gemfiles/Gemfile.activerecord52
-- gemfiles/Gemfile.activerecord60
 - lib/active_record/connection_adapters/pedant_mysql2_adapter.rb
 - lib/activerecord-pedantmysql2-adapter.rb
 - lib/pedant_mysql2.rb

data/.travis.yml

@@ -1,24 +0,0 @@
-services:
-  - mysql
-
-rvm:
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-gemfile:
-  - gemfiles/Gemfile.activerecord52
-  - gemfiles/Gemfile.activerecord60
-  - gemfiles/Gemfile.activerecord-edge
-
-matrix:
-  exclude:
-    - rvm: '2.5'
-      gemfile: gemfiles/Gemfile.activerecord-edge
-    - rvm: '2.6'
-      gemfile: gemfiles/Gemfile.activerecord-edge
-
-before_script:
-  - mysql -u root -h 127.0.0.1 -e 'create database pedant_mysql2_test;'
-
-sudo: false