Handle disconnect errors in ibmdb and jdbc/db2 adapters (Fixes #2083)

jeremyevans · Sep 26, 2023 · 856a918 · 856a918
1 parent cd25a09
commit 856a918
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 === master
 
+* Handle disconnect errors in ibmdb and jdbc/db2 adapters (jeremyevans) (#2083)
+
 * Support skipping transactions in Dataset#{import,paged_each} using :skip_transaction option (jeremyevans)
 
 * Add Database#transaction :skip_transaction option to skip creating a transaction or savepoint (jeremyevans)

diff --git a/lib/sequel/adapters/ibmdb.rb b/lib/sequel/adapters/ibmdb.rb
@@ -301,7 +301,7 @@ def database_error_classes
       end
 
       def database_exception_sqlstate(exception, opts)
-        exception.sqlstate
+        exception.sqlstate if exception.respond_to?(:sqlstate)
       end
 
       def dataset_class_default

diff --git a/lib/sequel/adapters/jdbc/db2.rb b/lib/sequel/adapters/jdbc/db2.rb
@@ -36,6 +36,10 @@ module DatabaseMethods
 
         private
 
+        def database_exception_sqlstate(exception, opts)
+          exception.sql_state if exception.respond_to?(:sql_state)
+        end
+
         def set_ps_arg(cps, arg, i)
           case arg
           when Sequel::SQL::Blob

diff --git a/lib/sequel/adapters/shared/db2.rb b/lib/sequel/adapters/shared/db2.rb
@@ -215,6 +215,18 @@ def database_error_regexps
         DATABASE_ERROR_REGEXPS
       end
 
+      DISCONNECT_SQL_STATES = %w'40003 08001 08003'.freeze
+      def disconnect_error?(exception, opts)
+        sqlstate = database_exception_sqlstate(exception, opts)
+
+        case sqlstate
+        when *DISCONNECT_SQL_STATES
+          true
+        else
+          super
+        end
+      end
+
       # DB2 has issues with quoted identifiers, so
       # turn off database quoting by default.
       def quote_identifiers_default