activerecord-mysql-reconnect 0.4.0 → 0.4.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4739211c7d68c950f02a389a199ac953edb9346c
-  data.tar.gz: aa3824a24006c4f756e8888776b1be254a6b9d92
+  metadata.gz: c37f85305063d95208c4a30ace243a62709d0d25
+  data.tar.gz: 55d1bf38531ede94d81d977e33f3def41719f09d
 SHA512:
-  metadata.gz: 088a4a7e0b756eff50878720a35c27ad96c1e93a002dc3c7cabdff0c9220f4b057b636b3693bc305ec95167c6234cdb51929972d61acef5df7954acb14b56558
-  data.tar.gz: 86a1698ce6854e3b10bae489f8e6178a6472c50fd94fa5fd16ef73894c350ef0a2dd6496abe35497d0be5316d1d6cb5682b942bbda3264bdf1047fb38b43ce58
+  metadata.gz: a83fe523cc08085211d963711f06264d20728cf8d7e3d3c9458cbd57f77faee1a2e597bd8487bc804bc81d83a23cdec747732a4d28c1b670ebe12de6f9376e2d
+  data.tar.gz: 17ce95bde54d2b35ef1a9f92dd9a6546dd1e6f02a85fd8bdc276c6d49133e95e960c1f14730e44d8c5f82e0e984772a0f12cd7763111a7c5ded6e6dac5d8c388

data/.rspec

@@ -1,4 +1,3 @@
 --require spec_helper
 --colour
---require rspec/instafail
---format RSpec::Instafail
+--format documentation

data/.travis.yml

@@ -2,27 +2,31 @@ dist: trusty
 sudo: required
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 before_install:
+  - docker-compose up -d
+  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
+  - for i in {1..60}; do mysql_ping && break; sleep 1; done
   - 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:
+  - docker-compose stop
+  - sudo rm -rf /tmp/mysql_for_ar_mysql_reconn
+script:
   - bundle exec rake
+gemfile:
+  - gemfiles/activerecord_4.2.gemfile
+  - gemfiles/activerecord_5.0.gemfile
 env:
-  - 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
+  matrix:
+    - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
+    - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
+matrix:
+  exclude:
+    - rvm: 2.1.9
+      gemfile: gemfiles/activerecord_5.0.gemfile
 addons:
   apt:
     packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+      - mysql-client-core-5.6
+      - mysql-client-5.6

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "activerecord-4.2" do
+  gem "activerecord", "~> 4.2.0"
+end
+
+appraise "activerecord-5.0" do
+  gem "activerecord", "~> 5.0.0"
+end

data/ChangeLog

@@ -1,3 +1,8 @@
+activerecord-mysql-reconnect 0.4.1 (Aug 8, 2016)
+
+	* Support AR 5.0 (RP#5 @ssig33)
+	* Fix test (use docker-compose)
+
 activerecord-mysql-reconnect 0.4.0 (Mar 22, 2016)
 
 	* Remove `retryable_transaction`

data/README.md

@@ -100,13 +100,16 @@ 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 on local
+## Running tests
+
+It requires the following:
+
+* Docker
+* Docker Compose
 
 ```sh
-mysql.server start
-export ACTIVERECORD_MYSQL_RECONNECT_MYSQL_START='mysql.server start'
-export ACTIVERECORD_MYSQL_RECONNECT_MYSQL_STOP='mysql.server stop'
-export ACTIVERECORD_MYSQL_RECONNECT_MYSQL_RESTART='killall -9 mysqld; sleep 3; mysql.server restart; true'
 bundle install
-bundle exec rake
+bundle exec appraisal install
+bundle exec appraisal activerecord-4.2 rake
+bundle exec appraisal activerecord-5.0 rake
 ```

data/activerecord-mysql-reconnect.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
-  spec.add_development_dependency 'rspec-instafail'
+  spec.add_development_dependency "appraisal"
 end

data/docker-compose.yml

@@ -0,0 +1,8 @@
+mysql_for_ar_mysql_reconn:
+  image: "mysql:5.6"
+  ports:
+    - "3306:3306"
+  environment:
+    MYSQL_ROOT_PASSWORD: password
+  volumes:
+    - /tmp/mysql_for_ar_mysql_reconn:/var/lib/mysql

data/gemfiles/activerecord_4.2.gemfile

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

data/gemfiles/activerecord_4.2.gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: ../
+  specs:
+    activerecord-mysql-reconnect (0.4.0)
+      activerecord
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.4)
+    mysql2 (0.4.4)
+    rake (11.1.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.0)
+  activerecord-mysql-reconnect!
+  appraisal
+  bundler
+  rake
+  rspec (>= 3.0.0)
+
+BUNDLED WITH
+   1.11.2

data/gemfiles/activerecord_5.0.gemfile

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

data/gemfiles/activerecord_5.0.gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: ../
+  specs:
+    activerecord-mysql-reconnect (0.4.0)
+      activerecord
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.1)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    mysql2 (0.4.4)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  activerecord-mysql-reconnect!
+  appraisal
+  bundler
+  rake
+  rspec (>= 3.0.0)
+
+BUNDLED WITH
+   1.11.2

data/lib/activerecord/mysql/reconnect.rb

@@ -8,6 +8,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'active_record/connection_adapters/abstract/connection_pool'
+require 'active_record/connection_adapters/abstract/transaction'
 
 require 'activerecord/mysql/reconnect/version'
 require 'activerecord/mysql/reconnect/base_ext'
@@ -15,6 +16,7 @@ require 'activerecord/mysql/reconnect/base_ext'
 require 'activerecord/mysql/reconnect/abstract_mysql_adapter_ext'
 require 'activerecord/mysql/reconnect/mysql2_adapter_ext'
 require 'activerecord/mysql/reconnect/connection_pool_ext'
+require 'activerecord/mysql/reconnect/null_transaction_ext'
 
 module Activerecord::Mysql::Reconnect
   DEFAULT_EXECUTION_TRIES = 3

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

@@ -1,23 +1,30 @@
-class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-  def execute_with_reconnect(sql, name = nil)
+module Activerecord::Mysql::Reconnect::ExecuteWithReconnect
+  def execute(sql, name = nil)
     retryable(sql, name) do |sql_names|
       retval = nil
 
       sql_names.each do |s, n|
-        retval = execute_without_reconnect(s, n)
+        retval = super(s, n)
       end
 
       retval
     end
   end
+end
 
-  alias_method_chain :execute, :reconnect
+class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
+  prepend Activerecord::Mysql::Reconnect::ExecuteWithReconnect
 
   private
 
   def retryable(sql, name, &block)
     block_with_reconnect = nil
     sql_names = [[sql, name]]
+    transaction = current_transaction
+
+    if sql =~ /\ABEGIN\z/i and transaction.is_a?(ActiveRecord::ConnectionAdapters::NullTransaction)
+      def transaction.state; nil; end
+    end
 
     Activerecord::Mysql::Reconnect.retryable(
       :proc => proc {

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

@@ -28,11 +28,5 @@ class ActiveRecord::Base
         yield
       end
     end
-
-    def retryable_transaction
-      Activerecord::Mysql::Reconnect.retryable_transaction do
-        yield
-      end
-    end
   end
 end

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

@@ -1,12 +1,11 @@
-class ActiveRecord::ConnectionAdapters::ConnectionPool
-  def new_connection_with_retry
+module Activerecord::Mysql::Reconnect::NewConnectionWithRetry
+  def new_connection
     Activerecord::Mysql::Reconnect.retryable(
-      :proc => proc {
-        new_connection_without_retry
-      },
+      :proc => proc { super },
       :connection => spec.config,
     )
   end
-
-  alias_method_chain :new_connection, :retry
+end
+class ActiveRecord::ConnectionAdapters::ConnectionPool
+  prepend Activerecord::Mysql::Reconnect::NewConnectionWithRetry
 end

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

@@ -1,12 +1,13 @@
-class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  def reconnect_with_retry!
+module Activerecord::Mysql::Reconnect::ReconnectWithRetry
+  def reconnect!
     Activerecord::Mysql::Reconnect.retryable(
-      :proc => proc {
-        reconnect_without_retry!
-      },
+      :proc => proc { super },
       :connection => @connection
     )
   end
+end
 
-  alias_method_chain :reconnect!, :retry
+class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+  alias_method :reconnect_without_retry!, :reconnect!
+  prepend Activerecord::Mysql::Reconnect::ReconnectWithRetry
 end

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

@@ -0,0 +1,9 @@
+module Activerecord::Mysql::Reconnect::NullTransactionExt
+  def state
+    nil
+  end
+end
+
+class ActiveRecord::ConnectionAdapters::NullTransaction
+  prepend Activerecord::Mysql::Reconnect::NullTransactionExt
+end

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

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.4.0'
+      VERSION = '0.4.1.beta'
     end
   end
 end

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -1,57 +1,96 @@
 describe 'activerecord-mysql-reconnect' do
-  it 'select all' do
-    expect {
-      expect(Employee.all.length).to eq(300024)
-      mysql_restart
-      expect(Employee.all.length).to eq(300024)
-    }.to_not raise_error
+  before(:each) do
+    ActiveRecord::Base.establish_connection(
+      :adapter  => 'mysql2',
+      :host     => '127.0.0.1',
+      :username => 'root',
+      :database => 'employees'
+    )
+
+    ActiveRecord::Base.logger = Logger.new($stdout)
+    ActiveRecord::Base.logger.formatter = proc {|_, _, _, message| "#{message}\n" }
+
+    if ENV['DEBUG'] == '1'
+      ActiveRecord::Base.logger.level = Logger::DEBUG
+    else
+      ActiveRecord::Base.logger.level = Logger::ERROR
+    end
+
+    ActiveRecord::Base.enable_retry = true
+    ActiveRecord::Base.execution_tries = 10
+    ActiveRecord::Base.retry_mode = :rw
+    ActiveRecord::Base.retry_databases = []
   end
 
-  it 'count' do
-    expect {
-      expect(Employee.count).to eq(300024)
-      mysql_restart
-      expect(Employee.count).to eq(300024)
-    }.to_not raise_error
+  let(:insert_with_sleep) do
+    <<-SQL
+      INSERT INTO `employees` (
+        `birth_date`,
+        `emp_no`,
+        `first_name`,
+        `hire_date`,
+        `last_name`
+      ) VALUES (
+        '2014-01-09 03:22:25',
+        SLEEP(10),
+        'Scott',
+        '2014-01-09 03:22:25',
+        'Tiger'
+      )
+    SQL
   end
 
-  it 'on select' do
-    expect {
-      th = thread_run {|do_stop|
-        expect(Employee.where(:id => 1).pluck('sleep(10) * 0')).to eq([0])
-      }
+  context 'when select all on same thread' do
+    specify do
+      expect(Employee.all.length).to eq 1000
+      MysqlServer.restart
+      expect(Employee.all.length).to eq 1000
+    end
+  end
 
-      mysql_restart
-      expect(Employee.count).to be >= 300024
-      th.join
-    }.to_not raise_error
+  context 'when count on same thead' do
+    specify do
+      expect(Employee.count).to eq 1000
+      MysqlServer.restart
+      expect(Employee.count).to eq 1000
+    end
   end
 
-  it 'on insert' do
-    expect {
-      th = thread_run {|do_stop|
-        emp = nil
+  context 'wehn select on other thread' do
+    specify do
+      th = thread_start {
+        expect(Employee.where(:id => 1).pluck('sleep(10) * 0 + 3')).to eq [3]
+      }
 
-        mysql2_error('MySQL server has gone away') do
-          emp = Employee.create(
-                  :emp_no     => 1,
-                  :birth_date => Time.now,
-                  :first_name => "' + sleep(10) + '",
-                  :last_name  => 'Tiger',
-                  :hire_date  => Time.now
-                )
-        end
+      MysqlServer.restart
+      expect(Employee.count).to eq 1000
+      th.join
+    end
+  end
 
-        do_stop.call
+  context 'when insert on other thread' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('MySQL server has gone away')
+    end
 
-        expect(emp.id).to eq(300025)
-        expect(emp.emp_no).to eq(1)
+    specify do
+      th = thread_start {
+        emp = Employee.create(
+          :emp_no     => 9999,
+          :birth_date => Time.now,
+          # wait 10 sec
+          :first_name => "' + sleep(10) + '",
+          :last_name  => 'Tiger',
+          :hire_date  => Time.now
+        )
+
+        expect(emp.id).to eq 1001
+        expect(emp.emp_no).to eq 9999
       }
 
-      mysql_restart
-      expect(Employee.count).to be >= 300024
+      MysqlServer.restart
       th.join
-    }.to_not raise_error
+    end
   end
 
   [
@@ -66,263 +105,299 @@ describe 'activerecord-mysql-reconnect' do
     'Unknown MySQL server host', # For DNS blips
     "Lost connection to MySQL server at 'reading initial communication packet'",
   ].each do |errmsg|
-    it "on error: #{errmsg}" do
-      expect {
-        th = thread_run {|do_stop|
-          emp = nil
-
-          mysql2_error("x#{errmsg}x") do
-            emp = Employee.create(
-                    :emp_no     => 1,
-                    :birth_date => Time.now,
-                    :first_name => "' + sleep(10) + '",
-                    :last_name  => 'Tiger',
-                    :hire_date  => Time.now
-                  )
-          end
-
-          do_stop.call
-
-          expect(emp.id).to eq(300025)
-          expect(emp.emp_no).to eq(1)
+    context "when `#{errmsg}` is happened" do
+      before do
+        allow_any_instance_of(Mysql2::Error).to receive(:message).and_return(errmsg)
+      end
+
+      specify do
+        th = thread_start {
+          emp = Employee.create(
+            :emp_no     => 9999,
+            :birth_date => Time.now,
+            # wait 10 sec
+            :first_name => "' + sleep(10) + '",
+            :last_name  => 'Tiger',
+            :hire_date  => Time.now
+          )
+
+          expect(emp.id).to eq 1001
+          expect(emp.emp_no).to eq 9999
         }
 
-        mysql_restart
-        expect(Employee.count).to be >= 300024
+        MysqlServer.restart
         th.join
-      }.to_not raise_error
+      end
     end
   end
 
-  it "on unhandled error" do
-    expect {
-      th = thread_run {|do_stop|
-        emp = nil
+  context 'when unexpected error is happened' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return("unexpected error")
+    end
 
-        mysql2_error("unhandled error") do
+    specify do
+      th = thread_start {
+        expect {
           emp = Employee.create(
-                  :emp_no     => 1,
-                  :birth_date => Time.now,
-                  :first_name => "' + sleep(10) + '",
-                  :last_name  => 'Tiger',
-                  :hire_date  => Time.now
-                )
-        end
-
-        do_stop.call
-
-        expect(emp.id).to eq(300025)
-        expect(emp.emp_no).to eq(1)
+            :emp_no     => 9999,
+            :birth_date => Time.now,
+            # wait 10 sec
+            :first_name => "' + sleep(10) + '",
+            :last_name  => 'Tiger',
+            :hire_date  => Time.now
+          )
+        }.to raise_error(/unexpected error/)
       }
 
-      mysql_restart
-      expect(Employee.count).to be >= 300024
+      MysqlServer.restart
       th.join
-    }.to raise_error(/unhandled error/)
+    end
   end
 
-  it 'op update' do
-    expect {
-      th = thread_run {|do_stop|
+  context 'when update on other thread' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('MySQL server has gone away')
+    end
+
+    specify do
+      th = thread_start {
         emp = Employee.where(:id => 1).first
+        # wait 10 sec
         emp.first_name = "' + sleep(10) + '"
         emp.last_name = 'ZapZapZap'
-
-        mysql2_error('MySQL server has gone away') do
-          emp.save!
-        end
-
-        do_stop.call
+        emp.save!
 
         emp = Employee.where(:id => 1).first
-        expect(emp.last_name).to eq('ZapZapZap')
+        expect(emp.last_name).to eq 'ZapZapZap'
       }
 
-      mysql_restart
-      expect(Employee.count).to eq(300024)
+      MysqlServer.restart
       th.join
-    }.to_not raise_error
-  end
-
-  it 'without_retry' do
-    expect {
-      ActiveRecord::Base.without_retry do
-        Employee.count
-        mysql_restart
-        Employee.count
-      end
-    }.to raise_error(ActiveRecord::StatementInvalid)
+    end
   end
 
-  it 'transaction' do
-    unless /MyISAM/i =~ ENV['ACTIVERECORD_MYSQL_RECONNECT_ENGINE']
+  context 'when use #without_retry' do
+    specify do
       expect {
-        expect(Employee.count).to eq(300024)
-
-        mysql2_error('MySQL server has gone away') do
-          ActiveRecord::Base.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(300025)
-            expect(emp.emp_no).to eq(2)
-          end
+        ActiveRecord::Base.without_retry do
+          Employee.count
+          MysqlServer.restart
+          Employee.count
         end
+      }.to raise_error(ActiveRecord::StatementInvalid)
+    end
+  end
+
+  context 'with transaction' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('MySQL server has gone away')
+    end
+
+    specify do
+      skip if myisam?
+
+      expect(Employee.count).to eq 1000
+
+      ActiveRecord::Base.transaction do
+        emp = Employee.create(
+          :emp_no     => 9999,
+          :birth_date => Time.now,
+          :first_name => 'Scott',
+          :last_name  => 'Tiger',
+          :hire_date  => Time.now
+        )
+
+        expect(emp.id).to eq 1001
+        expect(emp.emp_no).to eq 9999
+
+        MysqlServer.restart
+
+        emp = Employee.create(
+          :emp_no     => 9998,
+          :birth_date => Time.now,
+          :first_name => 'Scott',
+          :last_name  => 'Tiger',
+          :hire_date  => Time.now
+        )
+
+        # NOTE: Ignore the transaction on :rw mode
+        expect(emp.id).to eq 1001
+        expect(emp.emp_no).to eq 9998
+      end
 
-        expect(Employee.count).to eq(300025)
-      }.to_not raise_error
+      expect(Employee.count).to eq 1001
     end
   end
 
- it 'retry new connection' do
-    expect {
+  context 'when new connection' do
+    specify do
       ActiveRecord::Base.clear_all_connections!
-      mysql_restart
-      expect(Employee.count).to eq(300024)
-    }.to_not raise_error
+      MysqlServer.restart
+      expect(Employee.count).to eq 1000
+    end
   end
 
-  it 'retry verify' do
-    expect {
-      th = thread_run {|do_stop|
-        mysql_stop
+  context 'when connection verify' do
+    specify do
+      th = thread_start {
+        MysqlServer.stop
         sleep 10
-        mysql_start
+        MysqlServer.start
       }
 
+      sleep 5
       ActiveRecord::Base.connection.verify!
       th.join
-    }.to_not raise_error
+    end
   end
 
-  it 'retry reconnect' do
-    expect {
-      th = thread_run {|do_stop|
-        mysql_stop
+  context 'when connection reconnect' do
+    specify do
+      th = thread_start {
+        MysqlServer.stop
         sleep 10
-        mysql_start
+        MysqlServer.start
       }
 
+      sleep 5
       ActiveRecord::Base.connection.reconnect!
       th.join
-    }.to_not raise_error
+    end
   end
 
-  it 'disable reconnect' do
-    disable_retry do
+  context 'when disable reconnect' do
+    specify do
+      ActiveRecord::Base.enable_retry = false
+
       expect {
-        expect(Employee.all.length).to eq(300024)
-        mysql_restart
-        expect(Employee.all.length).to eq(300024)
+        expect(Employee.all.length).to eq 1000
+        MysqlServer.restart
+        expect(Employee.all.length).to eq 1000
       }.to raise_error(ActiveRecord::StatementInvalid)
-    end
 
-    expect {
-      expect(Employee.all.length).to eq(300024)
-      mysql_restart
-      expect(Employee.all.length).to eq(300024)
-    }.to_not raise_error
+      ActiveRecord::Base.enable_retry = true
+
+      expect(Employee.all.length).to eq 1000
+      MysqlServer.restart
+      expect(Employee.all.length).to eq 1000
+    end
   end
 
-  it 'read only (read)' do
-    enable_read_only do
-      expect {
-        expect(Employee.all.length).to eq(300024)
-        mysql_restart
-        expect(Employee.all.length).to eq(300024)
-      }.to_not raise_error
+  context 'when select on :r mode' do
+    before do
+      ActiveRecord::Base.retry_mode = :r
+    end
+
+    specify do
+      expect(Employee.all.length).to eq 1000
+      MysqlServer.restart
+      expect(Employee.all.length).to eq 1000
     end
   end
 
-  it 'read only (write)' do
-    enable_read_only do
-      expect {
-        lock_table
-
-        th = thread_run {|do_stop|
-          mysql2_error('MySQL server has gone away') do
-            emp = Employee.create(
-                    :emp_no     => 1,
-                    :birth_date => Time.now,
-                    :first_name => 'Scott',
-                    :last_name  => 'Tiger',
-                    :hire_date  => Time.now
-                  )
-          end
-        }
+  context 'when insert on :r mode' do
+    before do
+      ActiveRecord::Base.retry_mode = :r
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('MySQL server has gone away')
+    end
 
-        mysql_restart
-        th.join
+    specify do
+      expect(Employee.all.length).to eq 1000
+
+      MysqlServer.restart
+
+      expect {
+        Employee.create(
+          :emp_no     => 9999,
+          :birth_date => Time.now,
+          # wait 10 sec
+          :first_name => "' + sleep(10) + '",
+          :last_name  => 'Tiger',
+          :hire_date  => Time.now
+        )
       }.to raise_error(ActiveRecord::StatementInvalid)
     end
   end
 
-  it 'lost connection' do
-    sql = "INSERT INTO `employees` (`birth_date`, `emp_no`, `first_name`, `hire_date`, `last_name`) VALUES ('2014-01-09 03:22:25', SLEEP(10), 'Scott', '2014-01-09 03:22:25', 'Tiger')"
+  context 'when `lost connection` is happened' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('Lost connection to MySQL server during query')
+    end
 
-    expect {
-      ActiveRecord::Base.connection.execute(sql)
-    }.to_not raise_error
+    specify do
+      expect(Employee.all.length).to eq 1000
 
-    lock_table
+      MysqlServer.restart
 
-    mysql2_error('Lost connection to MySQL server during query') do
       expect {
-        th = thread_run {|do_stop|
-          ActiveRecord::Base.connection.execute(sql)
-        }
-
-        sleep 3
-        mysql_restart
-        th.join
+        Employee.create(
+          :emp_no     => 9999,
+          :birth_date => Time.now,
+          # wait 10 sec
+          :first_name => "' + sleep(10) + '",
+          :last_name  => 'Tiger',
+          :hire_date  => Time.now
+        )
       }.to raise_error(ActiveRecord::StatementInvalid)
     end
   end
 
-  it 'force retry' do
-    sql = "INSERT INTO `employees` (`birth_date`, `emp_no`, `first_name`, `hire_date`, `last_name`) VALUES ('2014-01-09 03:22:25', 1, 'Scott', '2014-01-09 03:22:25', 'Tiger')"
+  context 'when `lost connection` is happened on :force mode' do
+    before do
+      ActiveRecord::Base.retry_mode = :force
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('Lost connection to MySQL server during query')
+    end
 
-    expect {
-      ActiveRecord::Base.connection.execute(sql)
-    }.to_not raise_error
+    specify do
+      expect(Employee.all.length).to eq 1000
 
-    lock_table
+      MysqlServer.restart
 
-    mysql2_error('Lost connection to MySQL server during query') do
-      expect {
-        th = thread_run {|do_stop|
-          force_retry do
-            ActiveRecord::Base.connection.execute(sql)
-          end
-        }
+      emp = Employee.create(
+        :emp_no     => 9999,
+        :birth_date => Time.now,
+        # wait 10 sec
+        :first_name => "' + sleep(10) + '",
+        :last_name  => 'Tiger',
+        :hire_date  => Time.now
+      )
 
-        mysql_restart
-        th.join
-      }.to_not raise_error
+      expect(emp.id).to eq 1001
+      expect(emp.emp_no).to eq 9999
     end
   end
 
-  it 'read-only=1' do
-    mysql2_error('The MySQL server is running with the --read-only option so it cannot execute this statement:') do
-      expect {
-        expect(Employee.all.length).to eq(300024)
-        mysql_restart
-        expect(Employee.all.length).to eq(300024)
-      }.to_not raise_error
+  context 'when `lost connection` is happened on :force mode (2)' do
+    before do
+      ActiveRecord::Base.retry_mode = :force
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('Lost connection to MySQL server during query')
+
+      Thread.start do
+        MysqlServer.lock_tables
+      end
+    end
+
+    specify do
+      th = thread_start {
+        ActiveRecord::Base.connection.execute(insert_with_sleep)
+      }
+
+      sleep 3
+      MysqlServer.restart
+      th.join
+    end
+  end
+
+  context 'when read-only=1' do
+    before do
+      allow_any_instance_of(Mysql2::Error).to receive(:message).and_return('The MySQL server is running with the --read-only option so it cannot execute this statement:')
+    end
+
+    specify do
+      expect(Employee.all.length).to eq 1000
+      MysqlServer.restart
+      expect(Employee.all.length).to eq 1000
     end
   end
 
@@ -331,20 +406,24 @@ describe 'activerecord-mysql-reconnect' do
     '127.0.0.2:employees',
     '127.0.0.\_:employees',
   ].each do |db|
-    it "retry specific database: #{db}" do
-      retry_databases(db) do
+    context "when retry specific database: #{db}" do
+      before do
+        ActiveRecord::Base.retry_databases = db
+      end
+
+      specify do
         expect {
-          expect(Employee.all.length).to eq(300024)
-          mysql_restart
-          expect(Employee.all.length).to eq(300024)
+          expect(Employee.all.length).to eq 1000
+          MysqlServer.restart
+          expect(Employee.all.length).to eq 1000
         }.to raise_error(ActiveRecord::StatementInvalid)
-      end
 
-      expect {
-        expect(Employee.all.length).to eq(300024)
-        mysql_restart
-        expect(Employee.all.length).to eq(300024)
-      }.to_not raise_error
+        ActiveRecord::Base.retry_databases = []
+
+        expect(Employee.all.length).to eq 1000
+        MysqlServer.restart
+        expect(Employee.all.length).to eq 1000
+      end
     end
   end
 
@@ -353,13 +432,15 @@ describe 'activerecord-mysql-reconnect' do
     '127.0.0.1:employees',
     '127.0.0._:e%',
   ].each do |db|
-    it "retry specific database: #{db}" do
-      retry_databases(db) do
-        expect {
-          expect(Employee.all.length).to eq(300024)
-          mysql_restart
-          expect(Employee.all.length).to eq(300024)
-        }.to_not raise_error
+    context "when retry specific database: #{db}" do
+      before do
+        ActiveRecord::Base.retry_databases = db
+      end
+
+      specify do
+        expect(Employee.all.length).to eq 1000
+        MysqlServer.restart
+        expect(Employee.all.length).to eq 1000
       end
     end
   end