[CONJ-1239] disable BULK use when there isn't any parameter

Author: rusher

src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java

@@ -117,6 +117,7 @@ private boolean executeInternalPreparedBatch() throws SQLException {
  && ((isCommandInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
  || (!isCommandInsert && conf.useBulkStmts()))
  && batchParameters.size() > 1
+ && batchParameters.get(0).size() > 0
  && autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS) {
  executeBatchBulk();
  return isCommandInsert;

src/main/java/org/mariadb/jdbc/ServerPreparedStatement.java

@@ -180,7 +180,8 @@ private boolean executeInternalPreparedBatch() throws SQLException {
  checkIfInsertCommand();
  if (((isCommandInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
  || (!isCommandInsert && conf.useBulkStmts()))
- && autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS) {
+ && autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS
+ && batchParameters.get(0).size() > 0) {
  executeBatchBulk(cmd);
  return isCommandInsert;
  } else {

src/test/java/org/mariadb/jdbc/integration/BatchTest.java

@@ -725,4 +725,36 @@ public String toString() {
  return "TimestampCal{" + "val=" + val + ", id=" + id + '}';
  }
  }
+
+
+ @Test
+ public void batchWithoutParameter() throws SQLException {
+ try (Connection con = createCon("&useServerPrepStmts=false&useBulkStmts=true")) {
+ batchWithoutParameter(con);
+ }
+ try (Connection con = createCon("&useServerPrepStmts=true&useBulkStmts=true")) {
+ batchWithoutParameter(con);
+ }
+ }
+
+ private void batchWithoutParameter(Connection con) throws SQLException {
+ Assumptions.assumeTrue(isMariaDBServer());
+ Statement stmt = con.createStatement();
+ stmt.execute("DROP TABLE IF EXISTS batchWithoutParameter");
+ stmt.setFetchSize(3);
+ stmt.execute("CREATE TABLE batchWithoutParameter(val varchar(10))");
+ try (PreparedStatement prep =
+ con.prepareStatement("INSERT INTO batchWithoutParameter VALUES ('')")) {
+ prep.addBatch();
+ prep.addBatch();
+ prep.addBatch();
+ prep.addBatch();
+ prep.executeBatch();
+
+ ResultSet rs = stmt.executeQuery("SELECT count(*) FROM batchWithoutParameter");
+ rs.next();
+ assertEquals(rs.getInt(1), 4);
+ }
+ }
+
 }