From 2467d212d5d4062775f1a5f06bc18fe3c9cb1246 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Fri, 28 Aug 2026 14:07:10 +0800 Subject: [PATCH] fix(dameng): normalize legacy DBX connection URLs Closes #7482 --- .../java/com/dbx/agent/dameng/DamengAgent.java | 3 ++- .../dbx/agent/dameng/DamengAgentUrlTest.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java index fee6b8b050..5b683a2789 100644 --- a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java +++ b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java @@ -2098,7 +2098,8 @@ public final class DamengAgent extends AbstractJdbcAgent { private static String buildUrl(ConnectParams params) { String connectionString = params.getConnection_string() == null ? "" : params.getConnection_string().trim(); - if (!connectionString.isEmpty()) { + if (!connectionString.isEmpty() + && !connectionString.regionMatches(true, 0, "dm://", 0, "dm://".length())) { return connectionString; } String database = params.getDatabase() == null ? "" : params.getDatabase().trim(); diff --git a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentUrlTest.java b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentUrlTest.java index 6548d65c28..c8f199c147 100644 --- a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentUrlTest.java +++ b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentUrlTest.java @@ -21,6 +21,24 @@ class DamengAgentUrlTest { Assertions.assertEquals("jdbc:dm://127.0.0.1:5236/MAIN", url); } + @Test + void rebuildsLegacyDbxUrlFromConnectionFields() throws Exception { + ConnectParams params = new ConnectParams( + "127.0.0.1", + 5236, + "MAIN", + "SYSDBA", + "pwd", + "", + "dm://SYSDBA:SYSDBA@legacy-host:5236/OLD", + false + ); + + String url = invokeBuildUrl(params); + + Assertions.assertEquals("jdbc:dm://127.0.0.1:5236/MAIN", url); + } + @Test void usesCompleteCustomJdbcUrlWithoutRewritingIt() throws Exception { ConnectParams params = new ConnectParams(