[CONJ-1102] BatchUpdateException.getUpdateCounts() wrong results

mariadb-corporation · Oct 26, 2023 · 8690386 · 8690386
1 parent 69735a5
commit 8690386
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java b/src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java
@@ -595,6 +595,7 @@ public List<Completion> executePipeline(
       return results;
     } catch (SQLException sqlException) {
       if (!closed) {
+        results.add(null);
         // read remaining results
         perMsgCounter++;
         for (; perMsgCounter < responseMsg[readCounter - 1]; perMsgCounter++) {
@@ -626,7 +627,7 @@ public List<Completion> executePipeline(
                       resultSetType,
                       closeOnCompletion));
             } catch (SQLException e) {
-              // eat
+              results.add(null);
             }
           }
         }

diff --git a/src/main/java/org/mariadb/jdbc/export/ExceptionFactory.java b/src/main/java/org/mariadb/jdbc/export/ExceptionFactory.java
@@ -193,8 +193,6 @@ public BatchUpdateException createBatchUpdate(
   public BatchUpdateException createBatchUpdate(
       List<Completion> res, int length, int[] responseMsg, SQLException sqle) {
     int[] updateCounts = new int[length];
-
-    int responseIncrement = 0;
     for (int i = 0; i < length; i++) {
       if (i >= responseMsg.length) {
         Arrays.fill(updateCounts, i, length, Statement.EXECUTE_FAILED);
@@ -204,8 +202,16 @@ public BatchUpdateException createBatchUpdate(
       if (MsgResponseNo < 1) {
         updateCounts[0] = Statement.EXECUTE_FAILED;
         return new BatchUpdateException(updateCounts, sqle);
-      } else if (MsgResponseNo == 1 && res.size() > i && res.get(i) instanceof OkPacket) {
-        updateCounts[i] = (int) ((OkPacket) res.get(i)).getAffectedRows();
+      } else if (MsgResponseNo == 1) {
+        if (i >= res.size() || res.get(i) == null) {
+          updateCounts[i] = Statement.EXECUTE_FAILED;
+          continue;
+        }
+        if (res.get(i) instanceof OkPacket) {
+          updateCounts[i] = (int) ((OkPacket) res.get(i)).getAffectedRows();
+          continue;
+        }
+        updateCounts[i] = Statement.SUCCESS_NO_INFO;
       } else {
         // unknown.
         updateCounts[i] = Statement.SUCCESS_NO_INFO;

diff --git a/src/test/java/org/mariadb/jdbc/integration/BatchTest.java b/src/test/java/org/mariadb/jdbc/integration/BatchTest.java
@@ -31,6 +31,29 @@ public static void after2() throws SQLException {
     stmt.execute("DROP TABLE IF EXISTS BatchTest");
   }
 
+  @Test
+  public void batchError() throws SQLException {
+    Statement stmt = sharedConn.createStatement();
+    stmt.execute("DROP TABLE IF EXISTS t1");
+    stmt.execute("CREATE TABLE t1(c0 DATE UNIQUE PRIMARY KEY NOT NULL)");
+
+    stmt.addBatch("INSERT INTO t1 VALUES ('2006-04-01')");
+    stmt.addBatch("INSERT INTO t1 VALUES ('2006-04-01')");
+    stmt.addBatch("INSERT INTO t1 VALUES ('2019-04-11')");
+    stmt.addBatch("INSERT INTO t1 VALUES ('2006-04-01')");
+    stmt.addBatch("INSERT INTO t1 VALUES ('2020-04-11')");
+    try {
+      stmt.executeBatch();
+      fail();
+    } catch (BatchUpdateException e) {
+      assertTrue(e.getMessage().contains("Duplicate entry"));
+      assertEquals(5, e.getUpdateCounts().length);
+      assertArrayEquals(
+          new int[] {1, java.sql.Statement.EXECUTE_FAILED, 1, java.sql.Statement.EXECUTE_FAILED, 1},
+          e.getUpdateCounts());
+    }
+  }
+
   @Test
   public void wrongParameter() throws SQLException {
     try (Connection con = createCon("&useServerPrepStmts=false")) {