Skip to content

Commit ddd8e9c

Browse files
authored
Revert "[fix-#11726] fix error when set connection proerty both in the URL an…" (#17080)
This reverts commit 8665951.
1 parent 34bd1d4 commit ddd8e9c

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

  • dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param

dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,10 @@ public String getValidationQuery() {
102102
@Override
103103
public String getJdbcUrl(ConnectionParam connectionParam) {
104104
PrestoConnectionParam prestoConnectionParam = (PrestoConnectionParam) connectionParam;
105-
/**
106-
* return jdbc url without other parameters, avoid to assign same parameters both in URL and properties.
107-
* or else got error msg: Connection property '...' is both in the URL and an argument
108-
* ref to <a href="https://prestodb.io/docs/current/installation/jdbc.html">Presto JDBC Driver</>
109-
*/
105+
if (MapUtils.isNotEmpty(prestoConnectionParam.getOther())) {
106+
return String.format("%s?%s", prestoConnectionParam.getJdbcUrl(),
107+
transformOther(prestoConnectionParam.getOther()));
108+
}
110109
return prestoConnectionParam.getJdbcUrl();
111110
}
112111

0 commit comments

Comments
 (0)