#4392: [fix-#11726] fix error when set connection proerty both in the URL and an argument (#15093)

Co-authored-by: zhangying14 <zhangying14@zuoyebang.com>
Co-authored-by: xiangzihao <460888207@qq.com>

commit.ref

@@ -1 +1 @@
-Subproject commit dc503b0e00dd0b25f810e5b8dd3496a1efa1fede
+Subproject commit 8665951981b48fad051fe7457af5fddf8e61de87

commit.yml

@@ -2,40 +2,46 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
+  /dolphinscheduler-datasource-plugin:
-    newFile: !uuid 'f817ae1ecbd1ef7c0b9bbd4fbb7cc408b3461eb6'
+    newFile: !uuid '5de6b7e6781f0201cb81854c7c1829b9077dd6b4'
-    oldFile: !uuid '202c04b9717b4a5e0e2c0f67117fb5d66a498d39'
+    oldFile: !uuid '6ef0010c9a11f979f7f99ffa2e710098949726bf'
-  /dolphinscheduler-api/src:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto:
-    newFile: !uuid 'a625e35b61f9e09962ba388cd41a9535c2e670db'
+    newFile: !uuid 'a24cf4ff5dc42e34369ef5a262e69fee366ba4cc'
-    oldFile: !uuid '1279e826fbff5b90f146c059d4ae0761f27c0003'
+    oldFile: !uuid '811b5194767073edbc95a2cdcf1e1086e4c8aa74'
-  /dolphinscheduler-api/src/main:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src:
-    newFile: !uuid 'a2f48a016ede8634631732df87cdc980b5aeb321'
+    newFile: !uuid '3c424ba0fd4ae6c1b7e0c4f20ebdcb764a0997f7'
-    oldFile: !uuid 'fd987ba07db045921b6ecb70ffe0c5a1897a02d5'
+    oldFile: !uuid '558a85d54f5b4acf130afed747586273e17077c2'
-  /dolphinscheduler-api/src/main/java:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main:
-    newFile: !uuid 'ef316f5ad88e99f5a663d3143600bf1e13de6b70'
+    newFile: !uuid '8de66af3a4c67b5354247e1fe806fd4967d7d56b'
-    oldFile: !uuid 'adc484ee918b4f6547a0ea5f6bb9306850eb3747'
+    oldFile: !uuid '1890644f83302ffddcd0256be1a038bc0e8d350a'
-  /dolphinscheduler-api/src/main/java/org:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java:
-    newFile: !uuid '31c8479a8b1869c6524ae26605de44f79a800c3d'
+    newFile: !uuid '7c76d5db80298112e5255b385db688301e6d0c2f'
-    oldFile: !uuid '89b1492c76cc9c3338b0d43ea1d1f059009cee4d'
+    oldFile: !uuid '4428fb2e5ae1d1bffd53472288c029250f8affc2'
-  /dolphinscheduler-api/src/main/java/org/apache:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org:
-    newFile: !uuid '07e50f9899f25a59d3d6ce24d1c91b67c371b988'
+    newFile: !uuid '94120f89424a36f8f1fd441b60eb8a9fa2ad3593'
-    oldFile: !uuid '194f58f3ec364c2d90817250db0c8a3470b6ea34'
+    oldFile: !uuid 'de3ddfba3fae95b46a26f2ab3d1a0d625c47430e'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache:
-    newFile: !uuid 'a7302b55758e1486a265b1fd69d01134b69fceda'
+    newFile: !uuid 'e4669444e1d3702e18e6c17ae41fccd90d2c41af'
-    oldFile: !uuid 'df9bcf257806dab5f8678659fd084c986a0da636'
+    oldFile: !uuid '92f462a5932e233ffa67149aedae27940d85b71f'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'ad3483903366a5be8d0127af7e389d5b8fdf5f98'
+    newFile: !uuid '9698cc168a33c34a0d2bd5f268d69e3c22dc9dfa'
-    oldFile: !uuid '6abab2aed245001512ad89e9ef29d3e5524f98e1'
+    oldFile: !uuid 'bbec139380b6c4cebe3989c9e413fce5d989d60d'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin:
-    newFile: !uuid '6f0a2c124e95d87ea5e5301b6df74a1ddff1d258'
+    newFile: !uuid '80477981d9730af415bf8c41021f1b640b2d37bf'
-    oldFile: !uuid '35a7a03c35285ba45f030241c7b3a513243b4b59'
+    oldFile: !uuid '894740dfac7370b157ab05ae60468b8ca05b890c'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource
-    newFile: !uuid 'f61eca7136a03ca3efa88a9c0bdda72bb8955516'
+  : newFile: !uuid '8a1695dcb2ee3639bef54be2edee93670786e112'
-    oldFile: !uuid '8322da44e8ac01251628737b36c6769c14a02f43'
+    oldFile: !uuid '28aa5b1003214d2131a9e86c27dd1478c0372303'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java:
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto
-    newFile: !uuid 'd06829bc7e05a4a6cac629c894f697b2fac23508'
+  : newFile: !uuid '7a79162fc0deb81413f8b57804f59ea0fc585c1a'
-    oldFile: !uuid 'b4a9bba80ecab976d81efd0508e144bc84489881'
+    oldFile: !uuid '6c67961eae6fe28657e2b420ed3d8e6e7a6f23a6'
-gitCommitId: !uuid 'dc503b0e00dd0b25f810e5b8dd3496a1efa1fede'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param
+  : newFile: !uuid '67ce12bb70bcad6a3d90d2a2da57c78566d40da4'
+    oldFile: !uuid '820e2bcac1bb5e5c42c51afbb76a66579c1f3247'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java
+  : newFile: !uuid 'e466ea98c9f322204b42da22571e5f3712b224a9'
+    oldFile: !uuid '06f22a705ac1af6c22a1c2cb64e8812b64fc3fa6'
+gitCommitId: !uuid '8665951981b48fad051fe7457af5fddf8e61de87'
 renames: {
   }
-revisionId: 4391
+revisionId: 4392