Throw the initial batchException

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

@@ -2683,10 +2683,17 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th
                         numBatchesPrepared = numBatchesExecuted;
                         continue;
                     }
-                    else
+                    else if (null != batchCommand.batchException) {
+                        // if batch exception occurred, loop out to throw the initial batchException
+                        numBatchesExecuted =  numBatchesPrepared;
+                        attempt++;
+                        continue;
+                    }
+                    else {
                         throw e;
+                    }
                 }
-                break;	
+                break;
             }
         }
     }

src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchTriggerTest.java

@@ -0,0 +1,161 @@
+/*
+ * Microsoft JDBC Driver for SQL Server
+ * 
+ * Copyright(c) Microsoft Corporation All rights reserved.
+ * 
+ * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information.
+ */
+package com.microsoft.sqlserver.jdbc.unit.statement;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+import org.opentest4j.TestAbortedException;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import com.microsoft.sqlserver.jdbc.SQLServerStatement;
+import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Utils;
+
+/**
+ * Tests batch execution with trigger exception
+ *
+ */
+@RunWith(JUnitPlatform.class)
+public class BatchTriggerTest extends AbstractTest {
+
+    static Statement stmt = null;
+    static Connection connection = null;
+    static String tableName = "triggerTable";
+    static String triggerName = "triggerTest";
+    static String customErrorMessage = "Custom error message, you should see me. col1 should be higher than 10";
+    static String insertQuery = "insert into " + tableName + " (col1, col2, col3, col4) values (1, '22-08-2017 17:30:00.000', 'R4760', 31)";
+
+    /**
+     * Tests that the proper trigger exception is thrown using statement
+     * 
+     * @throws SQLException
+     */
+    @Test
+    public void statementTest() throws SQLException {
+        Statement stmt = null;
+        try {
+            stmt = connection.createStatement();
+            stmt.addBatch(insertQuery);
+            stmt.executeBatch();
+            fail("Trigger Exception not thrown");
+        }
+        catch (Exception e) {
+            assertTrue(e.getMessage().equalsIgnoreCase(customErrorMessage));
+        }
+
+        finally {
+            if (stmt != null) {
+                stmt.close();
+            }
+        }
+    }
+
+    /**
+     * Tests that the proper trigger exception is thrown using preparedSatement
+     * 
+     * @throws SQLException
+     */
+    @Test
+    public void preparedStatementTest() throws SQLException {
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = connection.prepareStatement(insertQuery);
+            pstmt.addBatch();
+            pstmt.executeBatch();
+            fail("Trigger Exception not thrown");
+        }
+        catch (Exception e) {
+
+            assertTrue(e.getMessage().equalsIgnoreCase(customErrorMessage));
+        }
+        finally {
+            if (pstmt != null) {
+                pstmt.close();
+            }
+        }
+    }
+
+    /**
+     * Create the trigger
+     * 
+     * @param triggerName
+     * @throws SQLException
+     */
+    private static void createTrigger(String triggerName) throws SQLException {
+        String sql = "create trigger " + triggerName + " on " + tableName + " for insert " + "as " + "begin " + "if (select col1 from " + tableName
+                + ") > 10 " + "begin " + "return " + "end "
+                + "RAISERROR ('Custom error message, you should see me. col1 should be higher than 10', 16, 0) " + "rollback transaction " + "end";
+        stmt.execute(sql);
+    }
+
+    /**
+     * Creating tables
+     * 
+     * @throws SQLException
+     */
+    private static void createTable() throws SQLException {
+        String sql = "create table " + tableName + " ( col1 int, col2 varchar(50), col3 varchar(10), col4 int)";
+        stmt.execute(sql);
+    }
+
+    /**
+     * Setup test
+     * 
+     * @throws TestAbortedException
+     * @throws Exception
+     */
+    @BeforeAll
+    public static void testSetup() throws TestAbortedException, Exception {
+        connection = DriverManager.getConnection(connectionString);
+        stmt = (SQLServerStatement) connection.createStatement();
+        stmt.execute("IF EXISTS (\r\n" + "    SELECT *\r\n" + "    FROM sys.objects\r\n" + "    WHERE [type] = 'TR' AND [name] = '" + triggerName
+                + "'\r\n" + "    )\r\n" + "    DROP TRIGGER " + triggerName + ";");
+        dropTable();
+        createTable();
+        createTrigger(triggerName);
+    }
+
+    /**
+     * Drop the table
+     * 
+     * @throws SQLException
+     */
+    private static void dropTable() throws SQLException {
+        Utils.dropTableIfExists(tableName, stmt);
+    }
+
+    /**
+     * Cleaning up
+     * 
+     * @throws SQLException
+     */
+    @AfterAll
+    public static void terminateVariation() throws SQLException {
+        dropTable();
+        stmt.execute("IF EXISTS (\r\n" + "    SELECT *\r\n" + "    FROM sys.objects\r\n" + "    WHERE [type] = 'TR' AND [name] = '" + triggerName
+                + "'\r\n" + "    )\r\n" + "    DROP TRIGGER " + triggerName + ";");
+
+        if (null != connection) {
+            connection.close();
+        }
+        if (null != stmt) {
+            stmt.close();
+        }
+
+    }
+}