[incubator-dolphinscheduler] branch dev updated: for bug #1379. (#1439)

[jo...@apache.org]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 5cecc0e  for bug #1379. (#1439)
5cecc0e is described below

commit 5cecc0e6181e3d3c2c971411cf69b73acd8f68c7
Author: zhukai <bo...@qq.com>
AuthorDate: Wed Dec 11 16:22:21 2019 +0800

    for bug #1379. (#1439)
    
    Now all datatype use same method ` stmt.setString(index,value);` even DATE and TIMESTAMP.
    
    So i had improved it. If datatype is DATE use `stmt.setDate(index, java.sql.Date.valueOf(value));` , if datatype is TIMESTAMP use `stmt.setTimestamp(index, java.sql.Timestamp.valueOf(value));`.i
    
    When use DATE the param format must use $[yyyy-MM-dd] , When use TIMESTAMP the param format must use $[yyyy-MM-dd hh:mm:ss].
---
 .../java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java | 4 ++--
 .../org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
index 4328810..a6dd53e 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
@@ -98,11 +98,11 @@ public class ParameterUtils {
     }else if (dataType.equals(DataType.DOUBLE)){
       stmt.setDouble(index, Double.parseDouble(value));
     }else if (dataType.equals(DataType.DATE)){
-      stmt.setString(index, value);
+      stmt.setDate(index, java.sql.Date.valueOf(value));
     }else if (dataType.equals(DataType.TIME)){
       stmt.setString(index, value);
     }else if (dataType.equals(DataType.TIMESTAMP)){
-      stmt.setString(index, value);
+      stmt.setTimestamp(index, java.sql.Timestamp.valueOf(value));
     }else if (dataType.equals(DataType.BOOLEAN)){
       stmt.setBoolean(index,Boolean.parseBoolean(value));
     }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 68a63ea..854f78a 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -211,7 +211,7 @@ public class SqlTask extends AbstractTask {
         if (StringUtils.isNotEmpty(sqlParameters.getTitle())){
             String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(),
                     ParamUtils.convert(paramsMap));
-            logger.info("SQL tile : {}",title);
+            logger.info("SQL title : {}",title);
             sqlParameters.setTitle(title);
         }