Add 42108 and 42109 to transient errors list (#1643)

Also fixing some build and javadoc warnings
microsoft · Aug 30, 2021 · 09d35bf · 09d35bf
1 parent 8b15cc5
commit 09d35bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java b/src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerEnclaveProvider.java
@@ -168,6 +168,8 @@ default ResultSet executeSDPEv1(PreparedStatement stmt, String userSql,
      *        param names
      * @param connection
      *        connection
+     * @param sqlServerStatement
+     *        sqlServerStatement
      * @param stmt
      *        statement
      * @param rs

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -1310,6 +1310,8 @@ final SQLCollation getDatabaseCollation() {
     static final private java.util.logging.Logger loggerExternal = java.util.logging.Logger
             .getLogger("com.microsoft.sqlserver.jdbc.Connection");
     private static String loggingClassNameBase = "com.microsoft.sqlserver.jdbc.SQLServerConnection";
+
+    /** Instance-specific loggingClassName to identity the connection in logs */
     private String loggingClassName = loggingClassNameBase;
 
     /**

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerError.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerError.java
@@ -62,7 +62,7 @@ enum TransientError {
          */
         SQLSERVER_ERROR_4221(4221),
 
-        // The follow are from SqlClient
+        // The following are from SqlClient
 
         // Resource ID: %d. The %s limit for the database is %d and has been reached.
         SQLSERVER_ERROR_10928(10928),
@@ -72,7 +72,13 @@ enum TransientError {
          * Resource ID: %d. The %s minimum guarantee is %d, maximum limit is %d and the current usage for the database
          * is %d. However, the server is currently too busy to support requests greater than %d for this database.
          */
-        SQLSERVER_ERROR_10929(10929);
+        SQLSERVER_ERROR_10929(10929),
+
+        // Can not connect to the SQL pool since it is paused. Please resume the SQL pool and try again.
+        SQLSERVER_ERROR_42108(42108),
+
+        // The SQL pool is warming up. Please try again.
+        SQLSERVER_ERROR_42109(42109);
 
         private final int errNo;
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerLexer.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerLexer.java
@@ -20,7 +20,7 @@
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 class SQLServerLexer extends Lexer {
     static {
-        RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION);
+        RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION);
     }
 
     protected static final DFA[] _decisionToDFA;