activerecord-mysql-reconnect 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22787c59f28400f81aa1dc6647ecd14ceca54ecb648285ddee05e96c652c90f
-  data.tar.gz: 0f97dc3481ca776b51390fb01ed799df7043be4e20299534726f51e75b584c88
+  metadata.gz: 3bc18dd788aa14cabde46f1a2bc9c64aa9168dc2b3f0dad9ad1cb46a59be5168
+  data.tar.gz: a0ae45dcf3eb057079a0d20d5ef782df9a346467ef4b64fc6c63afd11652b841
 SHA512:
-  metadata.gz: d7da6b4b5ff50f35254f9bdc9f14d040cb8930d483d35b574edf1d7ec8c024ee9cc4455fdeb85589ec2c920e299bbf6d0c5cf6f896f36efb70d2fc69ec90e8e1
-  data.tar.gz: cd45c8a2b11f9db45830da921a755dab9db9793910323c2b36f05da3c27ebdab51577e3de6d7566d9fb1a8b60b38a22ea817bf21c70b0f4a8f21a68c8559bb6d
+  metadata.gz: 75535a38ab352914811c427a88323dcae8eee5d62dd789550cbb156969d54fd436c22f2222b6ef0aa4ca34b705a7fe497276b89018f6edd05b704d7ebc95060d
+  data.tar.gz: 118a316266cf5ec6d32fc168f70b9ecd85b242be259a6351be03591d6e6f9828dd5486457eb24857ed7d2124bdffe8214e074b77e72356ab0e1571712a27cde5

data/.travis.yml

@@ -2,9 +2,11 @@ dist: trusty
 sudo: required
 language: ruby
 rvm:
-  - 2.3.6
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - 2.7.0
 before_install:
   - docker-compose up -d
   - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
@@ -18,10 +20,24 @@ gemfile:
   - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.2.gemfile
+  - gemfiles/activerecord_6.0.gemfile
+  - gemfiles/activerecord_master.gemfile
 env:
   matrix:
     - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
     - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
+jobs:
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/activerecord_6.0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/activerecord_master.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/activerecord_6.0.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/activerecord_master.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/activerecord_4.2.gemfile
 addons:
   apt:
     packages:

data/Appraisals

@@ -14,3 +14,11 @@ end
 appraise "activerecord-5.2" do
   gem "activerecord", "~> 5.2.0"
 end
+
+appraise "activerecord-6.0" do
+  gem "activerecord", "~> 6.0.2"
+end
+
+appraise "activerecord-master" do
+  gem "activerecord", git: "https://github.com/rails/rails.git"
+end

data/README.md

@@ -109,7 +109,7 @@ ene
 * `:rw`     Retry in all SQL, but does not retry if `Lost connection` has happened in write SQL
 * `:force`  Retry in all SQL
 
-## Running tests
+## Run tests
 
 It requires the following:
 

data/gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.2"
+
+gemspec path: "../"

data/gemfiles/activerecord_master.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", git: "https://github.com/rails/rails.git"
+
+gemspec path: "../"

data/lib/activerecord/mysql/reconnect/connection_pool_ext.rb

@@ -1,9 +1,16 @@
 module Activerecord::Mysql::Reconnect::NewConnectionWithRetry
   def new_connection
-    Activerecord::Mysql::Reconnect.retryable(
-      :proc => proc { super },
-      :connection => spec.config,
-    )
+    if defined?(db_config)
+      Activerecord::Mysql::Reconnect.retryable(
+        :proc => proc { super },
+        :connection => db_config.configuration_hash
+      )
+    else
+      Activerecord::Mysql::Reconnect.retryable(
+        :proc => proc { super },
+        :connection => spec.config,
+      )
+    end
   end
 end
 class ActiveRecord::ConnectionAdapters::ConnectionPool

data/lib/activerecord/mysql/reconnect/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.4.2'
+      VERSION = '0.5.0'
     end
   end
 end

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -461,10 +461,18 @@ describe 'activerecord-mysql-reconnect' do
 
     context "when retry failed " do
       specify do
-        expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
-          "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
-          "#{mysql_error}: Lost connection to MySQL server during query: SELECT `employees`.* FROM `employees` [ActiveRecord::StatementInvalid]",
-        ])
+        if ActiveRecord::VERSION::MAJOR < 6
+          expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
+            "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
+            "#{mysql_error}: Lost connection to MySQL server during query: SELECT `employees`.* FROM `employees` [ActiveRecord::StatementInvalid]",
+          ])
+        else
+          expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
+            "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
+            "#{mysql_error}: Lost connection to MySQL server during query [ActiveRecord::StatementInvalid]",
+          ])
+        end
+
 
         (1.0..4.5).step(0.5).each do |sec|
           expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
@@ -489,10 +497,17 @@ describe 'activerecord-mysql-reconnect' do
 
     context "when retry succeeded" do
       specify do
-        expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
-          "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
-          "#{mysql_error}: Lost connection to MySQL server during query: SELECT `employees`.* FROM `employees` [ActiveRecord::StatementInvalid]",
-        ])
+        if ActiveRecord::VERSION::MAJOR < 6
+          expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
+            "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
+            "#{mysql_error}: Lost connection to MySQL server during query: SELECT `employees`.* FROM `employees` [ActiveRecord::StatementInvalid]",
+          ])
+        else
+          expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
+            "MySQL server has gone away. Trying to reconnect in 0.5 seconds.",
+            "#{mysql_error}: Lost connection to MySQL server during query [ActiveRecord::StatementInvalid]",
+          ])
+        end
 
         expect(Employee.all.length).to eq 1000
         MysqlServer.restart

data/spec/spec_helper.rb

@@ -47,4 +47,8 @@ RSpec.configure do |config|
     MysqlServer.reset
     ActiveRecord::Base.clear_all_connections!
   end
+
+  config.expect_with :rspec do |c|
+    c.max_formatted_output_length = 999999
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,6 +117,8 @@ files:
 - gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
 - gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_master.gemfile
 - lib/activerecord-mysql-reconnect.rb
 - lib/activerecord/mysql/reconnect.rb
 - lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb
@@ -150,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: It is the library to reconnect automatically when ActiveRecord is disconnected