Skip to content

fix Bug #119271: Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover), but works on #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wuzhengyi wants to merge 1 commit into
base: release/8.x
Choose a base branch
from
+38 −0
Open

fix Bug #119271: Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover), but works on #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,11 @@ protected void collectProperties(ConnectionUrlParser connStrParser, Properties i
setupPropertiesTransformer();
expandPropertiesFromConfigFiles(this.properties);
injectPerTypeProperties(this.properties);

// Fix protocol dependencies in global properties (e.g., set socketFactory when protocol=PIPE).
fixProtocolDependencies(this.properties);
// Workaround for zeroDateTimeBehavior=convertToNull hard-coded in NetBeans
replaceLegacyPropertyValues(this.properties);
}

/**
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/com/mysql/cj/ConnectionUrlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,39 @@ public void testReplaceLegacyPropertyValues() throws Exception {
}
}

@Test
public void testReplaceLegacyPropertyValuesInGlobalPropsForMultiHost() throws Exception {
// URL-level legacy value
String cs1 = "jdbc:mysql://host1:3306,host2:3306/db?zeroDateTimeBehavior=convertToNull";
ConnectionUrl url1 = ConnectionUrl.getConnectionUrlInstance(cs1, null);
assertEquals(ZeroDatetimeBehavior.CONVERT_TO_NULL.name(),
url1.getConnectionArgumentsAsProperties().getProperty(PropertyKey.zeroDateTimeBehavior.getKeyName()));
// Info map legacy value
String cs2 = "jdbc:mysql://host1:3306,host2:3306/db";
Properties p2 = new Properties();
p2.setProperty(PropertyKey.zeroDateTimeBehavior.getKeyName(), "convertToNull");
ConnectionUrl url2 = ConnectionUrl.getConnectionUrlInstance(cs2, p2);
assertEquals(ZeroDatetimeBehavior.CONVERT_TO_NULL.name(),
url2.getConnectionArgumentsAsProperties().getProperty(PropertyKey.zeroDateTimeBehavior.getKeyName()));
// Mixed: URL has unrelated params, info has legacy value
String cs3 = "jdbc:mysql://host1:3306,host2:3306/db?useSSL=false&allowPublicKeyRetrieval=true";
Properties p3 = new Properties();
p3.setProperty(PropertyKey.zeroDateTimeBehavior.getKeyName(), "convertToNull");
ConnectionUrl url3 = ConnectionUrl.getConnectionUrlInstance(cs3, p3);
assertEquals(ZeroDatetimeBehavior.CONVERT_TO_NULL.name(),
url3.getConnectionArgumentsAsProperties().getProperty(PropertyKey.zeroDateTimeBehavior.getKeyName()));
}

@Test
public void testFixProtocolDependenciesAppliedToGlobalProps() {
// When protocol=pipe is specified globally, socketFactory should be auto-set in global props too
String cs = "jdbc:mysql://host1:3306,host2:3306/db?protocol=pipe";
ConnectionUrl url = ConnectionUrl.getConnectionUrlInstance(cs, null);
Properties props = url.getConnectionArgumentsAsProperties();
assertEquals("com.mysql.cj.protocol.NamedPipeSocketFactory",
props.getProperty(PropertyKey.socketFactory.getKeyName()));
}

/**
* Tests jdbc:mysql+srv: connection strings.
*/
Expand Down