[dolphinscheduler] branch dev updated: [fix-5737] [Bug][Datasource] datsource other param check error (#5835)

[kirs]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 2df6ee1  [fix-5737] [Bug][Datasource] datsource other param check 
error (#5835)
2df6ee1 is described below

commit 2df6ee1efbe4aec0f5579315a1b19e247f4115a6
Author: geosmart <geosm...@hotmail.com>
AuthorDate: Sun Jul 18 21:46:58 2021 +0800

    [fix-5737] [Bug][Datasource] datsource other param check error (#5835)
    
    Co-authored-by: wanggang <wangg...@servyou.com.cn>
---
 .../common/datasource/AbstractDatasourceProcessor.java            | 2 +-
 .../dolphinscheduler/common/datasource/DatasourceUtilTest.java    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/datasource/AbstractDatasourceProcessor.java
 
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/datasource/AbstractDatasourceProcessor.java
index d03c13d..a9d3bce 100644
--- 
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/datasource/AbstractDatasourceProcessor.java
+++ 
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/datasource/AbstractDatasourceProcessor.java
@@ -30,7 +30,7 @@ public abstract class AbstractDatasourceProcessor implements 
DatasourceProcessor
 
     private static final Pattern DATABASE_PATTER = 
Pattern.compile("^[a-zA-Z0-9\\_\\-\\.]+$");
 
-    private static final Pattern PARAMS_PATTER = 
Pattern.compile("^[a-zA-Z0-9]+$");
+    private static final Pattern PARAMS_PATTER = 
Pattern.compile("^[a-zA-Z0-9\\-\\_\\/]+$");
 
     @Override
     public void checkDatasourceParam(BaseDataSourceParamDTO 
baseDataSourceParamDTO) {
diff --git 
a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/datasource/DatasourceUtilTest.java
 
b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/datasource/DatasourceUtilTest.java
index 8ebc5b1..1b8b59c 100644
--- 
a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/datasource/DatasourceUtilTest.java
+++ 
b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/datasource/DatasourceUtilTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.dolphinscheduler.common.datasource;
 
+import java.util.HashMap;
+import java.util.Map;
 import 
org.apache.dolphinscheduler.common.datasource.mysql.MysqlConnectionParam;
 import 
org.apache.dolphinscheduler.common.datasource.mysql.MysqlDatasourceParamDTO;
 import 
org.apache.dolphinscheduler.common.datasource.mysql.MysqlDatasourceProcessor;
@@ -44,7 +46,11 @@ public class DatasourceUtilTest {
         MysqlDatasourceParamDTO mysqlDatasourceParamDTO = new 
MysqlDatasourceParamDTO();
         mysqlDatasourceParamDTO.setHost("localhost");
         mysqlDatasourceParamDTO.setDatabase("default");
-        mysqlDatasourceParamDTO.setOther(null);
+        Map<String, String> other = new HashMap<>();
+        other.put("serverTimezone", "Asia/Shanghai");
+        other.put("queryTimeout", "-1");
+        other.put("characterEncoding", "utf8");
+        mysqlDatasourceParamDTO.setOther(other);
         DatasourceUtil.checkDatasourceParam(mysqlDatasourceParamDTO);
         Assert.assertTrue(true);
     }