Merge branch 'maintenance/3.3' into maintenance/3.4

# Conflicts: #	src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java #	src/main/java/org/mariadb/jdbc/ServerPreparedStatement.java #	src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

Author: rusher

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

@@ -126,6 +126,7 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
  && ((isNormalInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
  || (!clientParser.isInsert() && conf.useBulkStmts()))
  && batchParameters.size() > 1
+ && batchParameters.get(0).size() > 0
  && !clientParser.isMultiQuery()
  && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
  || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS)) {

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

@@ -181,7 +181,8 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
  if (((isNormalInsert && (conf.useBulkStmts() || conf.useBulkStmtsForInserts()))
  || (!clientParser.isInsert() && conf.useBulkStmts()))
  && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
- || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS)) {
+ || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS)
+ && batchParameters.get(0).size() > 0) {
  executeBatchBulk(cmd);
  return true;
  } else {

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

@@ -726,4 +726,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);
+ }
+ }
+
 }

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

@@ -1180,7 +1180,7 @@ public void createDatabaseIfNotExist() throws SQLException {
  // ensure connecting without DB
  String connStr =
  String.format(
- "jdbc:mariadb://%s:%s/?user=%s&password=%s&%s&createDatabaseIfNotExist",
+ "jdbc:mariadb://%s:%s/?user=%s&password=%s&%s&createDatabaseIfNotExist&allowPublicKeyRetrieval=true",
  hostname, port, user, password, defaultOther);
  try (Connection con = DriverManager.getConnection(connStr)) {
  con.createStatement().executeQuery("SELECT 1");
@@ -1189,7 +1189,7 @@ public void createDatabaseIfNotExist() throws SQLException {
  String nonExistentDatabase = "bla`f`l";
  connStr =
  String.format(
- "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&%s&createDatabaseIfNotExist",
+ "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&%s&createDatabaseIfNotExist&allowPublicKeyRetrieval=true",
  hostname, port, nonExistentDatabase, user, password, defaultOther);
  try (Connection con = DriverManager.getConnection(connStr)) {
  ResultSet rs = con.createStatement().executeQuery("select DATABASE()");
@@ -1200,7 +1200,7 @@ public void createDatabaseIfNotExist() throws SQLException {
  nonExistentDatabase = "bla`f`l0";
  connStr =
  String.format(
- "jdbc:mariadb:replication://%s:%s,%s:%s/%s?user=%s&password=%s&%s&createDatabaseIfNotExist",
+ "jdbc:mariadb:replication://%s:%s,%s:%s/%s?user=%s&password=%s&%s&createDatabaseIfNotExist&allowPublicKeyRetrieval=true",
  hostname, port, hostname, port, nonExistentDatabase, user, password, defaultOther);
  try (Connection con = DriverManager.getConnection(connStr)) {
  ResultSet rs = con.createStatement().executeQuery("select DATABASE()");

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

@@ -26,7 +26,7 @@ public void basic() throws SQLException {
 
  MariaDbDataSource ds2 = new MariaDbDataSource();
  ds2.setUrl(mDefUrl);
- ds2.setPassword("ttt");
+ ds2.setPassword(System.getenv("someP@ssword"));
  ds2.setUser("ttt");
  assertThrows(SQLException.class, ds2::getConnection);
  }
@@ -115,16 +115,15 @@ public void basic2() throws SQLException {
  ds.setUser("dd");
  assertEquals("dd", ds.getUser());
 
- ds.setPassword("pwd");
+ ds.setPassword(System.getenv("someOtherP@ssword"));
  assertThrows(SQLException.class, ds::getConnection);
  assertThrows(SQLException.class, ds::getPooledConnection);
 
  assertThrows(SQLException.class, () -> ds.setUrl("jdbc:wrong://d"));
 
  ds.setUrl("jdbc:mariadb://myhost:5500/db?someOption=val");
  assertEquals(
- "jdbc:mariadb://myhost:5500/db?user=dd&password=***&someOption=val&connectTimeout=50000",
- ds.getUrl());
+ "jdbc:mariadb://myhost:5500/db?user=dd&someOption=val&connectTimeout=50000", ds.getUrl());
  }
 
  @Test