[CONJ-910] permit jdbc:mysql scheme when connection string contains "permitMysqlScheme" for compatibility

Author: diego Dupin

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

@@ -474,7 +474,9 @@ private Configuration(
  * @return true if url string correspond.
  */
  public static boolean acceptsUrl(String url) {
- return url != null && url.startsWith("jdbc:mariadb:");
+ return url != null
+ && (url.startsWith("jdbc:mariadb:")
+ || (url.startsWith("jdbc:mysql:") && url.contains("permitMysqlScheme")));
  }
 
  public static Configuration parse(final String url) throws SQLException {

src/main/java/org/mariadb/jdbc/client/socket/impl/PacketWriter.java

@@ -703,8 +703,7 @@ private void checkMaxAllowedLength(int length) throws MaxAllowedPacketException
  }
 
  public boolean throwMaxAllowedLength(int length) {
- if (maxAllowedPacket != null)
- return cmdLength + length >= maxAllowedPacket;
+ if (maxAllowedPacket != null) return cmdLength + length >= maxAllowedPacket;
  return false;
  }
 

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

@@ -272,16 +272,14 @@ public void largeBatch(Connection con) throws SQLException {
  public void bulkPacketSplitMaxAllowedPacket() throws SQLException {
  int maxAllowedPacket = getMaxAllowedPacket();
  bulkPacketSplit(2, maxAllowedPacket - 40, maxAllowedPacket);
- if (maxAllowedPacket >= 16 * 1024 * 1024)
- bulkPacketSplit(2, maxAllowedPacket - 40, null);
+ if (maxAllowedPacket >= 16 * 1024 * 1024) bulkPacketSplit(2, maxAllowedPacket - 40, null);
  }
 
  @Test
  public void bulkPacketSplitMultiplePacket() throws SQLException {
  int maxAllowedPacket = getMaxAllowedPacket();
  bulkPacketSplit(4, getMaxAllowedPacket() / 3, maxAllowedPacket);
- if (maxAllowedPacket >= 16 * 1024 * 1024)
- bulkPacketSplit(4, getMaxAllowedPacket() / 3, null);
+ if (maxAllowedPacket >= 16 * 1024 * 1024) bulkPacketSplit(4, getMaxAllowedPacket() / 3, null);
  }
 
  @Test
@@ -298,7 +296,10 @@ public void bulkPacketSplit(int nb, int len, Integer maxAllowedPacket) throws SQ
  arr[pos] = (byte) ((pos % 60) + 65);
  }
 
- try (Connection con = createCon("&useServerPrepStmts&useBulkStmts" + (maxAllowedPacket != null ? "&maxAllowedPacket=" + maxAllowedPacket: ""))) {
+ try (Connection con =
+ createCon(
+ "&useServerPrepStmts&useBulkStmts"
+ + (maxAllowedPacket != null ? "&maxAllowedPacket=" + maxAllowedPacket : ""))) {
  Statement stmt = con.createStatement();
  stmt.execute("TRUNCATE BatchTest");
  stmt.execute("START TRANSACTION"); // if MAXSCALE ensure using WRITER

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

@@ -836,9 +836,9 @@ public void pamAuthPlugin() throws Throwable {
  testPort = Integer.parseInt(System.getenv("TEST_PAM_PORT"));
  }
  String connStr =
-  String.format(
-  "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&%s",
-  hostname, testPort, database, pamUser, pamPwd, defaultOther);
+ String.format(
+ "jdbc:mariadb://%s:%s/%s?user=%s&password=%s&%s",
+ hostname, testPort, database, pamUser, pamPwd, defaultOther);
  try {
  try (Connection connection =
  DriverManager.getConnection(connStr + "&restrictedAuth=dialog")) {

src/test/java/org/mariadb/jdbc/unit/util/ConfigurationTest.java

@@ -159,6 +159,7 @@ public void testAcceptsUrl() {
  assertFalse(driver.acceptsURL(null));
  assertTrue(driver.acceptsURL("jdbc:mariadb://localhost/test"));
  assertFalse(driver.acceptsURL("jdbc:mysql://localhost/test"));
+ assertTrue(driver.acceptsURL("jdbc:mysql://localhost/test?permitMysqlScheme"));
  }
 
  @Test
@@ -191,6 +192,14 @@ public void testConfigurationIsolation() throws Throwable {
  assertTrue(
  e.getMessage().contains("Wrong argument value 'wrong_val' for TransactionIsolation"));
  }
+
+ Assertions.assertNull(
+ Configuration.parse("jdbc:mysql://localhost/test?transactionIsolation=wrong_val"));
+
+ conf =
+ Configuration.parse(
+ "jdbc:mysql://localhost/test?transactionIsolation=SERIALIZABLE&permitMysqlScheme");
+ assertTrue(TransactionIsolation.SERIALIZABLE == conf.transactionIsolation());
  }
 
  @Test