fix bug #480

Author: shi-yuan

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>5.5.0.1</version>
+	<version>5.5.0.2</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>

src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java

@@ -1,11 +1,11 @@
 package org.nlpcn.es4sql.query.maker;
 
 import java.math.BigDecimal;
+import java.time.ZoneOffset;
 import java.util.*;
 
 import org.elasticsearch.join.aggregations.JoinAggregationBuilders;
 import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptType;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
@@ -417,6 +417,9 @@ private ValuesSourceAggregationBuilder dateRange(MethodField field) {
             } else if ("format".equals(kv.key)) {
                 dateRange.format(value);
                 continue;
+            } else if ("time_zone".equals(kv.key)) {
+                dateRange.timeZone(DateTimeZone.forTimeZone(TimeZone.getTimeZone(ZoneOffset.of(value))));
+                continue;
             } else if ("from".equals(kv.key)) {
                 dateRange.addUnboundedFrom(kv.value.toString());
                 continue;
@@ -461,7 +464,7 @@ private DateHistogramAggregationBuilder dateHistogram(MethodField field) throws
                     dateHistogram.format(value);
                     break;
                 case "time_zone":
-                    dateHistogram.timeZone(DateTimeZone.forTimeZone(TimeZone.getTimeZone(value)));
+                    dateHistogram.timeZone(DateTimeZone.forTimeZone(TimeZone.getTimeZone(ZoneOffset.of(value))));
                     break;
                 case "min_doc_count":
                     dateHistogram.minDocCount(Long.parseLong(value));