diff --git a/agents/drivers/informix/src/main/java/com/dbx/agent/informix/InformixAgent.java b/agents/drivers/informix/src/main/java/com/dbx/agent/informix/InformixAgent.java index 5c175f6280..b84908eef4 100644 --- a/agents/drivers/informix/src/main/java/com/dbx/agent/informix/InformixAgent.java +++ b/agents/drivers/informix/src/main/java/com/dbx/agent/informix/InformixAgent.java @@ -50,18 +50,12 @@ public final class InformixAgent extends AbstractJdbcAgent { String informixServer = params.getInformix_server(); informixServer = informixServer == null ? "" : informixServer.trim(); if (informixServer.isEmpty()) { - informixServer = containsIgnoreCase(extraParams, "INFORMIXSERVER=") ? "" : defaultInformixServer(params.getHost()); + informixServer = hasUrlParameter(extraParams, "INFORMIXSERVER") ? "" : defaultInformixServer(params.getHost()); } String serverParam = informixServer.isEmpty() ? "" : "INFORMIXSERVER=" + informixServer; - // Add CLIENT_LOCALE and DB_LOCALE defaults if not already specified - if (!containsIgnoreCase(extraParams, "CLIENT_LOCALE=")) { - String localeParam = "CLIENT_LOCALE=en_US.utf8"; - extraParams = extraParams.isEmpty() ? localeParam : extraParams + ";" + localeParam; - } - if (!containsIgnoreCase(extraParams, "DB_LOCALE=")) { - String localeParam = "DB_LOCALE=en_US.utf8"; - extraParams = extraParams.isEmpty() ? localeParam : extraParams + ";" + localeParam; + if (extraParams.isEmpty()) { + extraParams = "CLIENT_LOCALE=en_US.utf8;DB_LOCALE=en_US.utf8"; } List jdbcParams = new ArrayList<>(); @@ -526,8 +520,18 @@ public final class InformixAgent extends AbstractJdbcAgent { return false; } - private static boolean containsIgnoreCase(String value, String needle) { - return value.toLowerCase(Locale.ROOT).contains(needle.toLowerCase(Locale.ROOT)); + private static boolean hasUrlParameter(String urlParams, String parameterName) { + for (String urlParam : urlParams.split(";")) { + int separator = urlParam.indexOf('='); + if (separator < 0) { + continue; + } + String key = urlParam.substring(0, separator).trim(); + if (key.equalsIgnoreCase(parameterName)) { + return true; + } + } + return false; } public static void main(String[] args) { diff --git a/agents/drivers/informix/src/test/java/com/dbx/agent/informix/InformixAgentTest.java b/agents/drivers/informix/src/test/java/com/dbx/agent/informix/InformixAgentTest.java index 5bdc2ce509..1257f9e636 100644 --- a/agents/drivers/informix/src/test/java/com/dbx/agent/informix/InformixAgentTest.java +++ b/agents/drivers/informix/src/test/java/com/dbx/agent/informix/InformixAgentTest.java @@ -91,7 +91,49 @@ class InformixAgentTest { String url = InformixAgent.jdbcUrl(params); Assertions.assertEquals( - "jdbc:informix-sqli://172.26.128.159:20013/testdb:INFORMIXSERVER=ol_informix1410;CLIENT_LOCALE=en_US.utf8;DB_LOCALE=en_US.utf8", + "jdbc:informix-sqli://172.26.128.159:20013/testdb:INFORMIXSERVER=ol_informix1410;CLIENT_LOCALE=en_US.utf8", + url + ); + } + + @Test + void preservesManualUrlParametersWithoutAddingLocaleDefaults() { + String url = InformixAgent.jdbcUrl( + new ConnectParams( + "172.26.128.159", + 20013, + "testdb", + "", + "", + "DELIMIDENT=y", + "", + false + ) + ); + + Assertions.assertEquals( + "jdbc:informix-sqli://172.26.128.159:20013/testdb:INFORMIXSERVER=informix;DELIMIDENT=y", + url + ); + } + + @Test + void recognizesInformixServerParameterIgnoringCaseAndWhitespace() { + String url = InformixAgent.jdbcUrl( + new ConnectParams( + "172.26.128.159", + 20013, + "testdb", + "", + "", + "informixserver = ol_informix1410;DELIMIDENT=y", + "", + false + ) + ); + + Assertions.assertEquals( + "jdbc:informix-sqli://172.26.128.159:20013/testdb:informixserver = ol_informix1410;DELIMIDENT=y", url ); } @@ -112,7 +154,7 @@ class InformixAgentTest { ); Assertions.assertEquals( - "jdbc:informix-sqli://informix-host:9088/sysmaster:INFORMIXSERVER=informix;CLIENT_LOCALE=en_US.utf8;DB_LOCALE=en_US.utf8", + "jdbc:informix-sqli://informix-host:9088/sysmaster:INFORMIXSERVER=informix", url ); }