diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java index 53340fc014..2f650eeda3 100644 --- a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java +++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java @@ -1773,23 +1773,6 @@ public void testTimeFormatAndDateFormatReturnSameResult() { assertEquals(eval(dateFormatExpr), eval(timeFormatExpr)); } - @Test - public void testTimestampBracket() { - FunctionExpression expr = DSL.time_format( - functionProperties, - DSL.literal(new ExprDateValue("2023-01-16")), - DSL.literal(new ExprStringValue("%h %s"))); - - assertEquals( - expr.toString(), - "time_format(DATE '2023-01-16', \"%h %s\")" - ); - assertEquals( - "\"12 00\"", - eval(expr).toString() - ); - } - private ExprValue eval(Expression expression) { return expression.valueOf(); } diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java index 09241a3e66..eeff107f15 100644 --- a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java +++ b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java @@ -746,7 +746,6 @@ public void dateSearch() throws IOException { } } - @Ignore @Test public void dateSearchBraces() throws IOException { DateTimeFormatter formatter = DateTimeFormat.forPattern(TestsConstants.TS_DATE_FORMAT); diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java index f1119276b6..b969de7ec6 100644 --- a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java +++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java @@ -1298,6 +1298,14 @@ public void testTimestampBracket() throws IOException { result = executeQuery("select {ts '2020-09-16 17:30:00'}"); verifySchema(result, schema("{ts '2020-09-16 17:30:00'}", null, "timestamp")); verifyDataRows(result, rows("2020-09-16 17:30:00")); + + result = executeQuery("select {timestamp '2020-09-16 17:30:00.123'}"); + verifySchema(result, schema("{timestamp '2020-09-16 17:30:00.123'}", null, "timestamp")); + verifyDataRows(result, rows("2020-09-16 17:30:00.123")); + + result = executeQuery("select {ts '2020-09-16 17:30:00.123'}"); + verifySchema(result, schema("{ts '2020-09-16 17:30:00.123'}", null, "timestamp")); + verifyDataRows(result, rows("2020-09-16 17:30:00.123")); } @Test @@ -1309,6 +1317,14 @@ public void testTimeBracket() throws IOException { result = executeQuery("select {t '17:30:00'}"); verifySchema(result, schema("{t '17:30:00'}", null, "time")); verifyDataRows(result, rows("17:30:00")); + + result = executeQuery("select {time '17:30:00'}"); + verifySchema(result, schema("{time '17:30:00'}", null, "time")); + verifyDataRows(result, rows("17:30:00")); + + result = executeQuery("select {t '17:30:00'}"); + verifySchema(result, schema("{t '17:30:00'}", null, "time")); + verifyDataRows(result, rows("17:30:00")); } @Test diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java index 683ac60f01..7279553106 100644 --- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java +++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java @@ -9,7 +9,6 @@ import static org.opensearch.sql.ast.dsl.AstDSL.between; import static org.opensearch.sql.ast.dsl.AstDSL.not; import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName; -import static org.opensearch.sql.expression.function.BuiltinFunctionName.DATETIME; import static org.opensearch.sql.expression.function.BuiltinFunctionName.IS_NOT_NULL; import static org.opensearch.sql.expression.function.BuiltinFunctionName.IS_NULL; import static org.opensearch.sql.expression.function.BuiltinFunctionName.LIKE;