support time zone in date format function

shi-yuan · shi-yuan · commit 7af652c20ecc · 2018-04-05T18:12:14.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.2.3.1</version>
+	<version>6.2.3.2</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/SQLFunctions.java b/src/main/java/org/nlpcn/es4sql/SQLFunctions.java
@@ -57,6 +57,7 @@ public static Tuple<String, String> function(String methodName, List<KVValue> pa
                 functionStr = date_format(
                         Util.expr2Object((SQLExpr) paramers.get(0).value).toString(),
                         Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
+                        2 < paramers.size() ? Util.expr2Object((SQLExpr) paramers.get(2).value).toString() : null,
                         name);
                 break;
 
@@ -155,10 +156,12 @@ public static Tuple<String, String> split(String strColumn, String pattern, int
         return new Tuple<>(name, script);
     }
 
-    private static Tuple<String, String> date_format(String strColumn, String pattern, String valueName) {
+    private static Tuple<String, String> date_format(String strColumn, String pattern, String zoneId, String valueName) {
         String name = "date_format_" + random();
         if (valueName == null) {
-            return new Tuple<>(name, "def " + name + " = new SimpleDateFormat('" + pattern + "').format(new Date(doc['" + strColumn + "'].value - 8*1000*60*60))");
+            return new Tuple<>(name, "def " + name + " = DateTimeFormatter.ofPattern('" + pattern + "').withZone(" +
+                    (zoneId != null ? "ZoneId.of('" + zoneId + "')" : "ZoneId.systemDefault()") +
+                    ").format(Instant.ofEpochMilli(doc['" + strColumn + "'].value.getMillis()))");
         } else {
             return new Tuple<>(name, strColumn + "; def " + name + " = new SimpleDateFormat('" + pattern + "').format(new Date(" + valueName + " - 8*1000*60*60))");
         }
diff --git a/src/main/java/org/nlpcn/es4sql/Util.java b/src/main/java/org/nlpcn/es4sql/Util.java
@@ -11,7 +11,6 @@
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
-import org.nlpcn.es4sql.domain.Field;
 import org.nlpcn.es4sql.domain.KVValue;
 import org.nlpcn.es4sql.exception.SqlParseException;
 
