(iotdb) branch master updated: SQL syntax support for WEEK

[jackietien]

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

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 710ef7d92eb SQL syntax support for WEEK
710ef7d92eb is described below

commit 710ef7d92ebb6a44e5b74515db6c067bb09009b0
Author: FearfulTomcat27 <1471335...@qq.com>
AuthorDate: Wed Nov 6 14:14:25 2024 +0800

    SQL syntax support for WEEK
---
 .../scalar/IoTDBScalarFunctionTableIT.java               | 16 ++++++++++++++++
 .../iotdb/db/relational/grammar/sql/RelationalSql.g4     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBScalarFunctionTableIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBScalarFunctionTableIT.java
index 7859fd5b4a9..7be2698d59b 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBScalarFunctionTableIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBScalarFunctionTableIT.java
@@ -2831,6 +2831,22 @@ public class IoTDBScalarFunctionTableIT {
         expectedHeader,
         expectedAns,
         DATABASE_NAME);
+
+    expectedHeader = new String[] {"time", "s8", "_col2"};
+    expectedAns =
+        new String[] {
+          
"1970-01-01T00:00:00.001Z,2024-01-01T00:00:00.000Z,2023-12-28T00:00:00.000Z,",
+          
"1970-01-01T00:00:00.002Z,2024-01-01T01:00:00.000Z,2023-12-28T00:00:00.000Z,",
+          
"1970-01-01T00:00:00.003Z,2024-01-01T01:59:00.000Z,2023-12-28T00:00:00.000Z,",
+          
"1970-01-01T00:00:00.004Z,2023-12-31T23:59:00.000Z,2023-12-28T00:00:00.000Z,",
+          
"1970-01-01T00:00:00.005Z,1969-12-31T23:59:00.000Z,1969-12-25T00:00:00.000Z,",
+          "1970-01-01T00:00:00.006Z,null,null,",
+        };
+    tableResultSetEqualTest(
+        "select time,s8,date_bin(1W, s8) from dateBinTable",
+        expectedHeader,
+        expectedAns,
+        DATABASE_NAME);
   }
 
   @Test
diff --git 
a/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
 
b/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
index 602361b0257..f9a5908fe83 100644
--- 
a/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
+++ 
b/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
@@ -1273,7 +1273,7 @@ VARIATION: 'VARIATION';
 VERBOSE: 'VERBOSE';
 VERSION: 'VERSION';
 VIEW: 'VIEW';
-WEEK: 'WEEK';
+WEEK: 'WEEK' | 'W';
 WHEN: 'WHEN';
 WHERE: 'WHERE';
 WHILE: 'WHILE';