Fix for Bug#119271 (Bug#38599496), Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover).

fjssilva · fjssilva · commit e9dfbe88e0f2 · 2025-11-07T21:37:05.000Z
Change-Id: I5ff3fe76ce25cb64a3f94a3ae4287c51c6ca2051
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 9.6.0
 
+  - Fix for Bug#119271 (Bug#38599496), Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover).
+
   - Fix for Bug#119245 (Bug#38599240), Select into fix breaks queries with 'into' in them.
 
 Version 9.5.0
diff --git a/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java b/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java
@@ -371,6 +371,8 @@ protected void collectProperties(ConnectionUrlParser connStrParser, Properties i
         // Collect properties from additional sources.
         setupPropertiesTransformer();
         expandPropertiesFromConfigFiles(this.properties);
+        fixProtocolDependencies(this.properties);
+        replaceLegacyPropertyValues(this.properties);
         injectPerTypeProperties(this.properties);
     }
 
diff --git a/src/test/java/com/mysql/cj/ConnectionUrlTest.java b/src/test/java/com/mysql/cj/ConnectionUrlTest.java
@@ -1196,13 +1196,24 @@ public void testReplaceLegacyPropertyValues() throws Exception {
         connStr.add("jdbc:mysql://127.0.0.1:1234/db?key=value&zeroDateTimeBehavior=convertToNull");
         connStr.add("jdbc:mysql://(port=3306,user=root,password=pwd,zeroDateTimeBehavior=convertToNull)/test");
         connStr.add("jdbc:mysql://address=(port=3306)(user=root)(password=pwd)(zeroDateTimeBehavior=convertToNull)/test");
+        connStr.add("jdbc:mysql://onehost:1111,anotherhost:2222/db");
+        connStr.add("jdbc:mysql://onehost:1111,anotherhost:2222/db?key=value&zeroDateTimeBehavior=convertToNull");
+        connStr.add("jdbc:mysql://(host=onehost,port=1111,key=value,zeroDateTimeBehavior=convertToNull),anotherhost:2222/db");
+        connStr.add("jdbc:mysql:loadbalance://onehost:1111,anotherhost:2222/db");
+        connStr.add("jdbc:mysql:loadbalance://onehost:1111,anotherhost:2222/db?key=value&zeroDateTimeBehavior=convertToNull");
+        connStr.add("jdbc:mysql:loadbalance://(host=onehost,port=1111,key=value,zeroDateTimeBehavior=convertToNull),anotherhost:2222/db");
+        connStr.add("jdbc:mysql:replication://onehost:1111,anotherhost:2222/db");
+        connStr.add("jdbc:mysql:replication://onehost:1111,anotherhost:2222/db?key=value&zeroDateTimeBehavior=convertToNull");
+        connStr.add("jdbc:mysql:replication://(host=onehost,port=1111,key=value,zeroDateTimeBehavior=convertToNull),anotherhost:2222/db");
 
         Properties props = new Properties();
         props.setProperty(PropertyKey.zeroDateTimeBehavior.getKeyName(), "convertToNull");
 
         for (String cs : connStr) {
             ConnectionUrl connUrl = ConnectionUrl.getConnectionUrlInstance(cs, props);
             assertEquals(ZeroDatetimeBehavior.CONVERT_TO_NULL.name(), connUrl.getMainHost().getProperty(PropertyKey.zeroDateTimeBehavior.getKeyName()));
+            assertEquals(ZeroDatetimeBehavior.CONVERT_TO_NULL.name(),
+                    connUrl.getConnectionArgumentsAsProperties().getProperty(PropertyKey.zeroDateTimeBehavior.getKeyName()));
         }
     }
 
diff --git a/src/test/java/testsuite/regression/ConnectionRegressionTest.java b/src/test/java/testsuite/regression/ConnectionRegressionTest.java
@@ -21,6 +21,7 @@
 package testsuite.regression;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -12618,4 +12619,20 @@ public void testBug72036() throws Exception {
         assertTrue(testXaResA2.isSameRM(testXaResB));
     }
 
+    /**
+     * Tests fix for Bug#119271 (Bug#38599496), Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover).
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug119271() throws Exception {
+        Properties props = new Properties();
+        props.setProperty(PropertyKey.zeroDateTimeBehavior.getKeyName(), "convertToNull");
+
+        assertDoesNotThrow(() -> getConnectionWithProps(props).close());
+        assertDoesNotThrow(() -> getFailoverConnection(props).close());
+        assertDoesNotThrow(() -> getLoadBalancedConnection(props).close());
+        assertDoesNotThrow(() -> getSourceReplicaReplicationConnection(props).close());
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,8 @@ protected void collectProperties(ConnectionUrlParser connStrParser, Properties i`
`371`	`371`	`// Collect properties from additional sources.`
`372`	`372`	`setupPropertiesTransformer();`
`373`	`373`	`expandPropertiesFromConfigFiles(this.properties);`
	`374`	`+ fixProtocolDependencies(this.properties);`
	`375`	`+ replaceLegacyPropertyValues(this.properties);`
`374`	`376`	`injectPerTypeProperties(this.properties);`
`375`	`377`	`}`
`376`	`378`