activerecord-mysql-reconnect 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198fac8c01fa7e97d0af2958fe6dd03ec002161d
-  data.tar.gz: 21505eb2e5b498c9cbe2d1b46fc273a0551086c8
+  metadata.gz: 4739211c7d68c950f02a389a199ac953edb9346c
+  data.tar.gz: aa3824a24006c4f756e8888776b1be254a6b9d92
 SHA512:
-  metadata.gz: 22ba2d7d0e2534848c04068827dfb6c3c0d45ea7b3a002988e3570bd3d80870289b7761170a1ac62a1a44faf3393050b5cf33e727ddb9e7029a5e42f99533d20
-  data.tar.gz: 3c3cd86cc7f1e218b733dfde7c2dccdbb80c12badcec3f30784e5ed6b8ec059709f3becb38f9ff8db6692d3d4671a8e14ef9a7184a094c9bd0270e155f5a3b04
+  metadata.gz: 088a4a7e0b756eff50878720a35c27ad96c1e93a002dc3c7cabdff0c9220f4b057b636b3693bc305ec95167c6234cdb51929972d61acef5df7954acb14b56558
+  data.tar.gz: 86a1698ce6854e3b10bae489f8e6178a6472c50fd94fa5fd16ef73894c350ef0a2dd6496abe35497d0be5316d1d6cb5682b942bbda3264bdf1047fb38b43ce58

data/.travis.yml

@@ -1,18 +1,28 @@
+dist: trusty
+sudo: required
 language: ruby
 rvm:
-- 2.0.0
-script:
-- if [ -n "$ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION" ]; then sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> $ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION'/" activerecord-mysql-reconnect.gemspec; fi
-- sudo apt-get -y install sysvbanner
-- banner `mysqld --version`
-- banner $ACTIVERECORD_MYSQL_RECONNECT_ENGINE
-- bundle install -j4
-- banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-- bundle exec rake
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+before_install:
+  - gem install bundler
+  - sudo apt-get -y install sysvbanner
+  - if [ -n "$ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION" ]; then sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> $ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION'/" activerecord-mysql-reconnect.gemspec; fi
+  - bundle install
+before_scriot:
+  - banner `mysqld --version`
+  - banner $ACTIVERECORD_MYSQL_RECONNECT_ENGINE
+  - banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
+scriot:
+  - bundle exec rake
 env:
-- ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
-- ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=3.2.19 ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
-- ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=4.0.8 ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
-- ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
-- ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=3.2.19 ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
-- ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=4.0.8 ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
+  - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=4.2.6
+  - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM ACTIVERECORD_MYSQL_RECONNECT_AR_VERSION=4.2.6
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6

data/ChangeLog

@@ -1,21 +1,26 @@
-activerecord-mysql-reconnect 0.3.3 (January 18, 2014)
+activerecord-mysql-reconnect 0.4.0 (Mar 22, 2016)
+
+	* Remove `retryable_transaction`
+	* Disable support AR 3.x 4.0
+
+activerecord-mysql-reconnect 0.3.3 (Jan 18, 2014)
 
 	* use BigDecimal for sleep
 	* add handling error ('The MySQL server is running with the --read-only...')
 
-activerecord-mysql-reconnect 0.3.1 (January 9, 2014)
+activerecord-mysql-reconnect 0.3.1 (Jan 9, 2014)
 
 	* Retry mode is added
 
-activerecord-mysql-reconnect 0.3.0 (January 9, 2014)
+activerecord-mysql-reconnect 0.3.0 (Jan 9, 2014)
 
 	* Retry is disabled by default
 	* Read-only mode is added
 
-activerecord-mysql-reconnect 0.2.0 (January 4, 2014)
+activerecord-mysql-reconnect 0.2.0 (Jan 4, 2014)
 
 	* Retry transaction is supported
 
-activerecord-mysql-reconnect 0.1.0 (October 11, 2013)
+activerecord-mysql-reconnect 0.1.0 (Oct 11, 2013)
 
 	* activerecord-mysql-reconnect is released

data/README.md

@@ -66,16 +66,6 @@ ActiveRecord::Base.without_retry do
 end
 ```
 
-### retryable_transaction
-
-```ruby
-ActiveRecord::Base.retryable_transaction do
-  Employee.create(emp_no: 1, birth_date: Time.now, first_name: 'Scott', last_name: 'Tiger', hire_date: Time.now)
-  Employee.create(emp_no: 2, birth_date: Time.now, first_name: 'Scott', last_name: 'Tiger', hire_date: Time.now)
-  Employee.create(emp_no: 3, birth_date: Time.now, first_name: 'Scott', last_name: 'Tiger', hire_date: Time.now)
-end
-```
-
 ## Use on rails
 
 ### Gemfile

data/activerecord-mysql-reconnect.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  # '~> 3.2.19' or '~> 4.0.8' or '~> 4.1.4'
+  # '~> 4.2.6'
   spec.add_dependency 'activerecord'
   spec.add_dependency 'mysql2'
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-instafail'

data/lib/activerecord/mysql/reconnect.rb

@@ -11,8 +11,7 @@ require 'active_record/connection_adapters/abstract/connection_pool'
 
 require 'activerecord/mysql/reconnect/version'
 require 'activerecord/mysql/reconnect/base_ext'
-# XXX:
-#require 'activerecord/mysql/reconnect/abstract_adapter_ext'
+
 require 'activerecord/mysql/reconnect/abstract_mysql_adapter_ext'
 require 'activerecord/mysql/reconnect/mysql2_adapter_ext'
 require 'activerecord/mysql/reconnect/connection_pool_ext'
@@ -22,7 +21,6 @@ module Activerecord::Mysql::Reconnect
   DEFAULT_EXECUTION_RETRY_WAIT = 0.5
 
   WITHOUT_RETRY_KEY = 'activerecord-mysql-reconnect-without-retry'
-  RETRYABLE_TRANSACTION_KEY = 'activerecord-mysql-reconnect-transaction-retry'
 
   HANDLE_ERROR = [
     ActiveRecord::StatementInvalid,
@@ -163,22 +161,6 @@ module Activerecord::Mysql::Reconnect
       !!Thread.current[WITHOUT_RETRY_KEY]
     end
 
-    def retryable_transaction
-      begin
-        Thread.current[RETRYABLE_TRANSACTION_KEY] = []
-
-        ActiveRecord::Base.transaction do
-          yield
-        end
-      ensure
-        Thread.current[RETRYABLE_TRANSACTION_KEY] = nil
-      end
-    end
-
-    def retryable_transaction_buffer
-      Thread.current[RETRYABLE_TRANSACTION_KEY]
-    end
-
     private
 
     def retryable_loop(n)

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

@@ -7,7 +7,6 @@ class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
         retval = execute_without_reconnect(s, n)
       end
 
-      add_sql_to_transaction(sql, name)
       retval
     end
   end
@@ -19,7 +18,6 @@ class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
   def retryable(sql, name, &block)
     block_with_reconnect = nil
     sql_names = [[sql, name]]
-    orig_transaction = @transaction
 
     Activerecord::Mysql::Reconnect.retryable(
       :proc => proc {
@@ -29,32 +27,13 @@ class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
         unless block_with_reconnect
           block_with_reconnect = proc do |i|
             reconnect_without_retry!
-            @transaction = orig_transaction if orig_transaction
             block.call(i)
           end
         end
-
-        sql_names = merge_transaction(sql, name)
       },
       :sql => sql,
       :retry_mode => Activerecord::Mysql::Reconnect.retry_mode,
       :connection => @connection
     )
   end
-
-  def add_sql_to_transaction(sql, name)
-    if (buf = Activerecord::Mysql::Reconnect.retryable_transaction_buffer)
-      buf << [sql, name]
-    end
-  end
-
-  def merge_transaction(sql, name)
-    sql_name = [sql, name]
-
-    if (buf = Activerecord::Mysql::Reconnect.retryable_transaction_buffer)
-      buf + [sql_name]
-    else
-      [sql_name]
-    end
-  end
 end

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

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.3.9'
+      VERSION = '0.4.0'
     end
   end
 end

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -118,7 +118,7 @@ describe 'activerecord-mysql-reconnect' do
       mysql_restart
       expect(Employee.count).to be >= 300024
       th.join
-    }.to raise_error
+    }.to raise_error(/unhandled error/)
   end
 
   it 'op update' do
@@ -188,51 +188,7 @@ describe 'activerecord-mysql-reconnect' do
     end
   end
 
-  it 'retryable_transaction' do
-    unless /MyISAM/i =~ ENV['ACTIVERECORD_MYSQL_RECONNECT_ENGINE']
-      expect {
-        expect(Employee.count).to eq(300024)
-
-        mysql2_error('MySQL server has gone away') do
-          ActiveRecord::Base.retryable_transaction do
-            emp = Employee.create(
-                    :emp_no     => 1,
-                    :birth_date => Time.now,
-                    :first_name => 'Scott',
-                    :last_name  => 'Tiger',
-                    :hire_date  => Time.now
-                  )
-            expect(emp.id).to eq(300025)
-            expect(emp.emp_no).to eq(1)
-            mysql_restart
-            emp = Employee.create(
-                    :emp_no     => 2,
-                    :birth_date => Time.now,
-                    :first_name => 'Scott',
-                    :last_name  => 'Tiger',
-                    :hire_date  => Time.now
-                  )
-            expect(emp.id).to eq(300026)
-            expect(emp.emp_no).to eq(2)
-            mysql_restart
-            emp = Employee.create(
-                    :emp_no     => 3,
-                    :birth_date => Time.now,
-                    :first_name => 'Scott',
-                    :last_name  => 'Tiger',
-                    :hire_date  => Time.now
-                  )
-            expect(emp.id).to eq(300027)
-            expect(emp.emp_no).to eq(3)
-          end
-        end
-
-        expect(Employee.count).to eq(300027)
-      }.to_not raise_error
-    end
-  end
-
-  it 'retry new connection' do
+ it 'retry new connection' do
     expect {
       ActiveRecord::Base.clear_all_connections!
       mysql_restart

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   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: It is the library to reconnect automatically when ActiveRecord is disconnected
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - LICENSE.txt
@@ -113,13 +113,11 @@ files:
 - activerecord-mysql-reconnect.gemspec
 - lib/activerecord-mysql-reconnect.rb
 - lib/activerecord/mysql/reconnect.rb
-- lib/activerecord/mysql/reconnect/abstract_adapter_ext.rb
 - lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb
 - lib/activerecord/mysql/reconnect/base_ext.rb
 - lib/activerecord/mysql/reconnect/connection_pool_ext.rb
 - lib/activerecord/mysql/reconnect/mysql2_adapter_ext.rb
 - lib/activerecord/mysql/reconnect/version.rb
-- run-all-tests.sh
 - spec/activerecord-mysql-reconnect_spec.rb
 - spec/employees.sql
 - spec/spec_helper.rb
@@ -133,17 +131,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: It is the library to reconnect automatically when ActiveRecord is disconnected

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

@@ -1,3 +0,0 @@
-class ActiveRecord::ConnectionAdapters::AbstractAdapter
-  # XXX:
-end

data/run-all-tests.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-set -e
-
-# sysvbanner
-# https://github.com/uffejakobsen/sysvbanner
-
-banner `mysqld --version`
-
-export ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
-banner $ACTIVERECORD_MYSQL_RECONNECT_ENGINE
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '= 3.2.14'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> 3.2.14'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> 4.0'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-export ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
-banner $ACTIVERECORD_MYSQL_RECONNECT_ENGINE
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '= 3.2.14'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> 3.2.14'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-sed -i.bak "s/spec.add_dependency 'activerecord'.*/spec.add_dependency 'activerecord', '~> 4.0'/" activerecord-mysql-reconnect.gemspec
-bundle install -j4
-banner `bundle exec ruby -e 'require "active_record"; puts ActiveRecord::VERSION::STRING'`
-bundle exec rake
-
-git checkout activerecord-mysql-reconnect.gemspec
-rm *.bak spec/*.bak