activerecord-mysql-reconnect 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc078edb058b76e0a2608757ee28874723e17b0
-  data.tar.gz: 3ce76b372e6dcc6c0ea9a1d3c92852376671aa86
+  metadata.gz: 9ac7822c0f663ad7cf90036be1093e185b6a7510
+  data.tar.gz: 0e47d5cf1f48399f9f120d7596206521ba91be5d
 SHA512:
-  metadata.gz: f026083fd7126a3910045110d0fb697b004667eef51ad4bbaa201256ecdd8b216b1ba11401b19faa730e4a0f7bc2207ff11d62e25eb0c5c0c0508f942d2ee1d9
-  data.tar.gz: b0a162b084442e8fc6990f736f55cfedd5c36fb620403fbe3b1ec8351b8a5bf36b69058dc1564051474f14aec4da8667341e45ee8c0cc7acbe5295f1cfe9ab52
+  metadata.gz: 3e02a754713686f67ef46dddb0091c34caf7b43b596048ed5f83543f13093d61dfd5774dad7010a163a9e48474760736a4bec063b1424f6b13b2a95beb50c93b
+  data.tar.gz: 62edd5b7910a1723d334e91bab60e89ffb3f70c2c2886ffae06cee0857c123efb66786652ad73e2d0f67f0dd403acd87c50352b5c7b5cc677c720161d9276366

data/activerecord-mysql-reconnect.gemspec

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

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

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 require 'active_support'
+require 'mysql2'
 require 'logger'
 
 class ActiveRecord::Base
@@ -69,15 +70,20 @@ class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
     block_with_reconnect = nil
     retval = nil
     sql_names = [[sql, name]]
+    orig_transaction = @transaction
 
     retryable_loop(tries) do |n|
       begin
         retval = (block_with_reconnect || block).call(sql_names)
         break
-      rescue => e
+      rescue ActiveRecord::StatementInvalid, Mysql2::Error => e
         if not without_retry? and (tries.zero? or n < tries) and e.message =~ Regexp.union(ERROR_MESSAGES)
           unless block_with_reconnect
-            block_with_reconnect = proc {|i| reconnect! ; block.call(i) }
+            block_with_reconnect = proc do |i|
+              reconnect!
+              @transaction = orig_transaction if orig_transaction
+              block.call(i)
+            end
           end
 
           sql_names = merge_transaction(sql, name)

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

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/spec/activerecord/mysql/reconnect_spec.rb

@@ -1,4 +1,4 @@
-describe Hash do
+describe 'activerecord-mysql-reconnect' do
   it 'select all' do
     expect {
       expect(Employee.all.length).to eq(300024)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,16 +14,30 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        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: 3.2.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  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
   from MySQL.
 email: