Fix for uncaught/unhandled exception

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java

@@ -6334,9 +6334,20 @@ boolean onNBCRow(TDSReader tdsReader) throws SQLServerException {
             boolean onDone(TDSReader tdsReader) throws SQLServerException {
                 ensureStartMark();
 
-                // Consume the done token
-                StreamDone doneToken = new StreamDone();
-                doneToken.setFromTDS(tdsReader);
+                int token = tdsReader.peekTokenType();
+		StreamDone doneToken = new StreamDone();
+		doneToken.setFromTDS(tdsReader);
+
+                int packetType = tdsReader.peekTokenType();
+                if (-1 != packetType && TDS.TDS_DONEINPROC == token) {
+                	switch (packetType) {
+				case TDS.TDS_ENV_CHG:
+				case TDS.TDS_ERR:
+					return true;
+				default:
+					break;
+                	}
+                }
 
                 // Done with all the rows in this fetch buffer and done with parsing
                 // unless it's a server cursor, in which case there is a RETSTAT and

src/test/java/com/microsoft/sqlserver/jdbc/exception/ExceptionTest.java

@@ -7,19 +7,24 @@
  */
 package com.microsoft.sqlserver.jdbc.exception;
 
+import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.UnsupportedEncodingException;
 import java.net.SocketTimeoutException;
+import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 
 import com.microsoft.sqlserver.jdbc.SQLServerBulkCSVFileRecord;
 import com.microsoft.sqlserver.jdbc.SQLServerConnection;
+import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
 import com.microsoft.sqlserver.testframework.AbstractTest;
 import com.microsoft.sqlserver.testframework.Utils;
 
@@ -93,4 +98,56 @@ private void createWaitForDelayPreocedure(SQLServerConnection conn) throws SQLEx
         String sql = "CREATE PROCEDURE " + waitForDelaySPName + " AS" + " BEGIN" + " WAITFOR DELAY '00:00:" + waitForDelaySeconds + "';" + " END";
         conn.createStatement().execute(sql);
     }
-}
+
+    @Test
+    public void testResultSetErrorSearch() throws Exception {
+        SQLServerDataSource ds = new SQLServerDataSource();
+        ds.setURL(connectionString);
+
+    	String dropTable_sql = "DROP TABLE IF EXISTS TEST659;";
+    	String dropProc_sql = "DROP PROCEDURE IF EXISTS proc_insert_masse_TEST;";
+    	String createTable_sql = "CREATE TABLE TEST659 (ID INT IDENTITY NOT NULL," +
+							"FIELD1 VARCHAR (255) NOT NULL," +
+							"FIELD2 VARCHAR (255) NOT NULL);";
+    	String createProc_sql = "CREATE PROCEDURE proc_insert_masse_TEST @json NVARCHAR(MAX) "
+				+ "AS "
+				+ "BEGIN TRANSACTION "
+				+ "BEGIN TRY "
+				+ "SET NOCOUNT ON; "
+				+ "MERGE INTO TEST659 AS target "
+				+ "USING "
+					+ "(SELECT * FROM OPENJSON(@json) "
+					+ "WITH (FIELD1 VARCHAR(255) 'strict $.FIELD1')) "
+				+ "AS src "
+				+ "ON (1 = 0) "
+				+ "WHEN NOT MATCHED THEN "
+					+ "INSERT (FIELD1) VALUES (src.FIELD1) "
+					+ "OUTPUT inserted.ID; "
+				+ "COMMIT TRANSACTION; "
+				+ "END TRY "
+				+ "BEGIN CATCH "
+				+ "DECLARE @errorMessage NVARCHAR(4000) = ERROR_MESSAGE(); "
+				+ "ROLLBACK TRANSACTION; "
+				+ "RAISERROR('Error occured during the insert: %s', 16, 1, @errorMessage); "
+				+ "END CATCH;";
+    	String proc_sql = "EXECUTE [dbo].proc_insert_masse_TEST N'[{\"FIELD1\" : \"TEST\"}]';";
+
+		Connection conn = ds.getConnection();
+		if (conn.getMetaData().getDatabaseMajorVersion() >= 13)
+		{
+			Statement stmt = conn.createStatement();
+			stmt.execute(dropTable_sql);
+			stmt.execute(createTable_sql);
+			stmt.execute(dropProc_sql);
+			stmt.execute(createProc_sql);
+			stmt.execute(proc_sql);
+			ResultSet rs = stmt.getResultSet();
+	    	try {
+	    		rs.next();
+	    		fail("No exceptions caught.");    		
+	    	} catch (SQLException e) {
+	    		assertTrue(e.getMessage().contains("Error occured during the insert:"), "Unexpected Error Message: " + e.getMessage());
+	    	}
+		}
+    }
+}