odbc_adapter 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5157fd72c8b51e81109ffbc557706d5164e52ea
-  data.tar.gz: 07045f2ee0d6f4a8c61f0566e9a2ed4af6a88565
+  metadata.gz: 50537871f7c280cfa024f2757f0b34a24cf74494
+  data.tar.gz: ecfa4c272bdeb25fbcdfd82a7999613ff411de4f
 SHA512:
-  metadata.gz: 5ac83f350948348b7f0e36bc68881b2b401f47ebd449f615abee9f5650d1c1bda3fb6fb5de7519e3af5d5d4efbc5b2d61b67bacd96795eb96b3fcdbe77b0e1cb
-  data.tar.gz: 7263035cff902e1776abc8000b961d55779d1c6e9084cbaea24561d3ea2aef85bc9331bfbceee3885d85ad2dfa8909150edc8dee275652566cd25a51f645c129
+  metadata.gz: c82ef5e10b49d630fd7d1c0d9c57b947fd2fd71e9210bbe56c1bbfbc80f175de4e4323b6685ac518f2a0a128c9f9afe028288aba5d9971a4b2b90db913a67c4f
+  data.tar.gz: abec63e36b8bf76012eb9d0ac49972865096b7ad4c083a0586017c16e5d7c7c0e5c7ac9cf6cfc12b33133680100dc6cd5df411cfdfe2af3645dfaf4729bdbf02

data/lib/active_record/connection_adapters/odbc_adapter.rb

@@ -77,8 +77,9 @@ module ActiveRecord
       ADAPTER_NAME = 'ODBC'.freeze
       BOOLEAN_TYPE = 'BOOLEAN'.freeze
 
-      ERR_DUPLICATE_KEY_VALUE = 23505
-      ERR_QUERY_TIMED_OUT = /Query has timed out/
+      ERR_DUPLICATE_KEY_VALUE     = 23505
+      ERR_QUERY_TIMED_OUT         = 57014
+      ERR_QUERY_TIMED_OUT_MESSAGE = /Query has timed out/
 
       attr_reader :database_metadata
 
@@ -168,10 +169,12 @@ module ActiveRecord
       end
 
       def translate_exception(exception, message)
+        error_number = exception.message[/^\d+/].to_i
+
         case
-        when exception.message[/^\d+/].to_i == ERR_DUPLICATE_KEY_VALUE
+        when error_number == ERR_DUPLICATE_KEY_VALUE
           ActiveRecord::RecordNotUnique.new(message, exception)
-        when exception.message =~ ERR_QUERY_TIMED_OUT
+        when error_number == ERR_QUERY_TIMED_OUT, exception.message =~ ERR_QUERY_TIMED_OUT_MESSAGE
           ::ODBCAdapter::QueryTimeoutError.new(message, exception)
         else
           super

data/lib/odbc_adapter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odbc_adapter
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Localytics