[CONJ-996] ensure BatchUpdateException inherit SQLState & vendorCode …

…from the cause SQL exception
mariadb-corporation · Sep 5, 2022 · dfba0ad · dfba0ad
1 parent ea4f435
commit dfba0ad
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/Statement.java b/src/main/java/org/mariadb/jdbc/Statement.java
@@ -1545,7 +1545,8 @@ public List<Completion> executeInternalBatchStandard() throws SQLException {
         updateCounts[i] =
             completion instanceof OkPacket ? (int) ((OkPacket) completion).getAffectedRows() : 0;
       }
-      throw new BatchUpdateException(sqle.getMessage(), updateCounts, sqle);
+      throw new BatchUpdateException(
+          sqle.getMessage(), sqle.getSQLState(), sqle.getErrorCode(), updateCounts, sqle);
     } finally {
       localInfileInputStream = null;
     }

diff --git a/src/main/java/org/mariadb/jdbc/export/ExceptionFactory.java b/src/main/java/org/mariadb/jdbc/export/ExceptionFactory.java
@@ -177,7 +177,8 @@ public BatchUpdateException createBatchUpdate(
         updateCounts[i] = org.mariadb.jdbc.Statement.EXECUTE_FAILED;
       }
     }
-    return new BatchUpdateException(updateCounts, sqle);
+    return new BatchUpdateException(
+        sqle.getMessage(), sqle.getSQLState(), sqle.getErrorCode(), updateCounts, sqle);
   }
 
   /**
@@ -210,7 +211,8 @@ public BatchUpdateException createBatchUpdate(
         updateCounts[i] = Statement.SUCCESS_NO_INFO;
       }
     }
-    return new BatchUpdateException(updateCounts, sqle);
+    return new BatchUpdateException(
+        sqle.getMessage(), sqle.getSQLState(), sqle.getErrorCode(), updateCounts, sqle);
   }
 
   /**

diff --git a/src/test/java/org/mariadb/jdbc/integration/FailoverTest.java b/src/test/java/org/mariadb/jdbc/integration/FailoverTest.java
@@ -292,7 +292,10 @@ private void execute(Connection con, boolean transactionReplay, long threadId)
           p.executeBatch();
           Assertions.fail();
         } catch (SQLException e) {
-          Throwable ee = (e instanceof BatchUpdateException) ? e.getCause() : e;
+          SQLException ee = (SQLException) ((e instanceof BatchUpdateException) ? e.getCause() : e);
+          assertEquals(ee.getMessage(), e.getMessage());
+          assertEquals(ee.getSQLState(), e.getSQLState());
+          assertEquals(ee.getErrorCode(), e.getErrorCode());
           assertTrue(ee.getMessage().contains("In progress transaction was lost"));
         }
       }

diff --git a/src/test/java/org/mariadb/jdbc/integration/LocalInfileTest.java b/src/test/java/org/mariadb/jdbc/integration/LocalInfileTest.java
@@ -177,10 +177,22 @@ public void throwExceptions() throws Exception {
       stmt.addBatch(
           "LOAD DATA LOCAL INFILE 'someFile' INTO TABLE LocalInfileInputStreamTest2 (id, test)");
       stmt.addBatch("SET UNIQUE_CHECKS=1");
-      Common.assertThrowsContains(
-          BatchUpdateException.class,
-          stmt::executeBatch,
-          "Local infile is disabled by connector. Enable `allowLocalInfile` to allow local infile commands");
+
+      try {
+        stmt.executeBatch();
+        fail();
+      } catch (SQLException e) {
+        assertEquals(e.getClass(), BatchUpdateException.class);
+        assertTrue(
+            e.getMessage()
+                .contains(
+                    "Local infile is disabled by connector. Enable `allowLocalInfile` to allow local infile commands"));
+        assertNotNull(e.getCause());
+        assertEquals(e.getCause().getMessage(), e.getMessage());
+        assertEquals(((SQLException) e.getCause()).getSQLState(), e.getSQLState());
+        assertEquals(((SQLException) e.getCause()).getErrorCode(), e.getErrorCode());
+      }
+
       try (PreparedStatement prep =
           con.prepareStatement(
               "LOAD DATA LOCAL INFILE ? INTO TABLE LocalInfileInputStreamTest2 (id, test)")) {

diff --git a/src/test/java/org/mariadb/jdbc/integration/StatementTest.java b/src/test/java/org/mariadb/jdbc/integration/StatementTest.java
@@ -780,6 +780,10 @@ private void executeBatchBasic(Connection con) throws SQLException {
       assertTrue(
           e.getMessage().contains("You have an error in your SQL syntax")
               || e.getMessage().contains("syntax error"));
+      assertNotNull(e.getCause());
+      assertEquals(e.getCause().getMessage(), e.getMessage());
+      assertEquals(((SQLException) e.getCause()).getSQLState(), e.getSQLState());
+      assertEquals(((SQLException) e.getCause()).getErrorCode(), e.getErrorCode());
     }
   }
 
@@ -821,6 +825,10 @@ private void executeLargeBatchBasic(Connection con) throws SQLException {
       assertTrue(
           e.getMessage().contains("You have an error in your SQL syntax")
               || e.getMessage().contains("syntax error"));
+      assertNotNull(e.getCause());
+      assertEquals(e.getCause().getMessage(), e.getMessage());
+      assertEquals(((SQLException) e.getCause()).getSQLState(), e.getSQLState());
+      assertEquals(((SQLException) e.getCause()).getErrorCode(), e.getErrorCode());
     }
   }