Merge pull request #10 from localytics/timeout-errors

Manually rescue timeout errors

lib/active_record/connection_adapters/odbc_adapter.rb

@@ -2,9 +2,9 @@
 require 'arel/visitors/bind_visitor'
 require 'odbc'
 
-require 'odbc_adapter'
 require 'odbc_adapter/database_limits'
 require 'odbc_adapter/database_statements'
+require 'odbc_adapter/error'
 require 'odbc_adapter/quoting'
 require 'odbc_adapter/schema_statements'
 
@@ -76,7 +76,9 @@ class ODBCAdapter < AbstractAdapter
 
       ADAPTER_NAME = 'ODBC'.freeze
       BOOLEAN_TYPE = 'BOOLEAN'.freeze
+
       ERR_DUPLICATE_KEY_VALUE = 23505
+      ERR_QUERY_TIMED_OUT = /Query has timed out/
 
       attr_reader :database_metadata
 
@@ -166,9 +168,11 @@ def initialize_type_map(map)
       end
 
       def translate_exception(exception, message)
-        case exception.message[/^\d+/].to_i
-        when ERR_DUPLICATE_KEY_VALUE
+        case
+        when exception.message[/^\d+/].to_i == ERR_DUPLICATE_KEY_VALUE
           ActiveRecord::RecordNotUnique.new(message, exception)
+        when exception.message =~ ERR_QUERY_TIMED_OUT
+          ::ODBCAdapter::QueryTimeoutError.new(message, exception)
         else
           super
         end

lib/odbc_adapter/error.rb

@@ -0,0 +1,4 @@
+module ODBCAdapter
+  class QueryTimeoutError < ActiveRecord::StatementInvalid
+  end
+end

lib/odbc_adapter/version.rb

@@ -1,3 +1,3 @@
 module ODBCAdapter
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end