deadlock_retry 1.1.2 → 1.2.0

data/CHANGELOG

@@ -1,5 +1,10 @@
 deadlock_retry changes
 
+== v1.2.0
+
+* Support for postgres (tomhughes)
+* Testing AR versions (kbrock)
+
 == v1.1.2
 
 * Exponential backoff, sleep 0, 1, 2, 4... seconds between retries.

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/deadlock_retry.gemspec

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 
-require './lib/deadlock_retry'
+$:.push File.expand_path("../lib", __FILE__)
+
+require "deadlock_retry/version"
 
 Gem::Specification.new do |s|
   s.name = %q{deadlock_retry}
@@ -9,7 +11,9 @@ Gem::Specification.new do |s|
   s.description = s.summary = %q{Provides automatic deadlock retry and logging functionality for ActiveRecord and MySQL}
   s.email = %q{mperham@gmail.com}
   s.files = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.homepage = %q{http://github.com/mperham/deadlock_retry}
   s.require_paths = ["lib"]
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'activerecord', ENV['ACTIVERECORD_VERSION'] || ' ~>3.0'
 end

data/lib/deadlock_retry.rb

@@ -1,9 +1,6 @@
 require 'active_support/core_ext/module/attribute_accessors'
 
 module DeadlockRetry
-
-  VERSION = '1.1.2'
-
   def self.included(base)
     base.extend(ClassMethods)
     base.class_eval do
@@ -18,7 +15,8 @@ module DeadlockRetry
   module ClassMethods
     DEADLOCK_ERROR_MESSAGES = [
       "Deadlock found when trying to get lock",
-      "Lock wait timeout exceeded"
+      "Lock wait timeout exceeded",
+      "deadlock detected"
     ]
 
     MAXIMUM_RETRIES_ON_DEADLOCK = 3
@@ -71,17 +69,21 @@ module DeadlockRetry
     def check_innodb_status_available
       return unless DeadlockRetry.innodb_status_cmd == nil
 
-      begin
-        mysql_version = self.connection.execute('show variables like \'version\'').to_a[0][1]
-        cmd = if mysql_version < '5.5'
-          'show innodb status'
-        else
-          'show engine innodb status'
+      if self.connection.adapter_name == "MySQL"
+        begin
+          mysql_version = self.connection.select_rows('show variables like \'version\'')[0][1]
+          cmd = if mysql_version < '5.5'
+            'show innodb status'
+          else
+            'show engine innodb status'
+          end
+          self.connection.select_value(cmd)
+          DeadlockRetry.innodb_status_cmd = cmd
+        rescue
+          logger.info "Cannot log innodb status: #{$!.message}"
+          DeadlockRetry.innodb_status_cmd = false
         end
-        self.connection.select_value(cmd)
-        DeadlockRetry.innodb_status_cmd = cmd
-      rescue
-        logger.info "Cannot log innodb status: #{$!.message}"
+      else
         DeadlockRetry.innodb_status_cmd = false
       end
     end

data/lib/deadlock_retry/version.rb

@@ -0,0 +1,3 @@
+module DeadlockRetry
+  VERSION = '1.2.0'
+end

data/test/deadlock_retry_test.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 # Change the version if you want to test a different version of ActiveRecord
-gem 'activerecord', ' ~>3.0'
+gem 'activerecord', ENV['ACTIVERECORD_VERSION'] || ' ~>3.0'
 require 'active_record'
 require 'active_record/version'
 puts "Testing ActiveRecord #{ActiveRecord::VERSION::STRING}"
@@ -37,7 +37,7 @@ class MockModel
     []
   end
 
-  def self.execute(sql)
+  def self.select_rows(sql)
     [['version', '5.1.45']]
   end
 
@@ -45,6 +45,10 @@ class MockModel
     true
   end
 
+  def self.adapter_name
+    "MySQL"
+  end
+
   include DeadlockRetry
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deadlock_retry
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152103420 !ruby/object:Gem::Requirement
+  requirement: &70189971244660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152103420
+  version_requirements: *70189971244660
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70189971244140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70189971244140
 description: Provides automatic deadlock retry and logging functionality for ActiveRecord
   and MySQL
 email: mperham@gmail.com
@@ -32,11 +43,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README
 - Rakefile
 - deadlock_retry.gemspec
 - lib/deadlock_retry.rb
+- lib/deadlock_retry/version.rb
 - test/deadlock_retry_test.rb
 homepage: http://github.com/mperham/deadlock_retry
 licenses: []
@@ -58,9 +71,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides automatic deadlock retry and logging functionality for ActiveRecord
   and MySQL
-test_files: []
+test_files:
+- test/deadlock_retry_test.rb