This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit a34ed4643adad9affa79ba0076dfee9c044b2cd8 Author: starocean999 <[email protected]> AuthorDate: Fri Apr 26 09:38:10 2024 +0800 [fix](planner)date_add function should accept date type as its param (#34035) --- .../java/org/apache/doris/analysis/FunctionCallExpr.java | 16 ++++++++++++++++ gensrc/script/doris_builtins_functions.py | 2 ++ .../suites/correctness/test_date_function_const.groovy | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java index b703948468c..f62b45eb2e3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java @@ -1658,6 +1658,22 @@ public class FunctionCallExpr extends Expr { } fn = getBuiltinFunction(fnName.getFunction(), argTypes, Function.CompareMode.IS_NONSTRICT_SUPERTYPE_OF); + } else if (fnName.getFunction().equalsIgnoreCase("date_add") + || fnName.getFunction().equalsIgnoreCase("days_add") + || fnName.getFunction().equalsIgnoreCase("adddate") + || fnName.getFunction().equalsIgnoreCase("date_sub") + || fnName.getFunction().equalsIgnoreCase("days_sub") + || fnName.getFunction().equalsIgnoreCase("subdate")) { + Type[] childTypes = collectChildReturnTypes(); + argTypes[0] = childTypes[0]; + argTypes[1] = childTypes[1]; + if (childTypes[1] == Type.TINYINT || childTypes[1] == Type.SMALLINT) { + // be only support second param as int type + uncheckedCastChild(Type.INT, 1); + argTypes[1] = Type.INT; + } + fn = getBuiltinFunction(fnName.getFunction(), argTypes, + Function.CompareMode.IS_NONSTRICT_SUPERTYPE_OF); } else { // now first find table function in table function sets if (isTableFnCall) { diff --git a/gensrc/script/doris_builtins_functions.py b/gensrc/script/doris_builtins_functions.py index 841799f0a13..b7912d08904 100644 --- a/gensrc/script/doris_builtins_functions.py +++ b/gensrc/script/doris_builtins_functions.py @@ -1080,6 +1080,8 @@ visible_functions = { [['weeks_sub'], 'DATEV2', ['DATEV2', 'INT'], ''], [['days_add', 'date_add', 'adddate'], 'DATEV2', ['DATEV2', 'INT'], ''], [['days_sub', 'date_sub', 'subdate'], 'DATEV2', ['DATEV2', 'INT'], ''], + [['days_add', 'date_add', 'adddate'], 'DATE', ['DATE', 'INT'], ''], + [['days_sub', 'date_sub', 'subdate'], 'DATE', ['DATE', 'INT'], ''], [['hours_add'], 'DATETIMEV2', ['DATEV2', 'INT'], ''], [['hours_sub'], 'DATETIMEV2', ['DATEV2', 'INT'], ''], [['minutes_add'], 'DATETIMEV2', ['DATEV2', 'INT'], ''], diff --git a/regression-test/suites/correctness/test_date_function_const.groovy b/regression-test/suites/correctness/test_date_function_const.groovy index 85d8e5ba711..df05738b1bf 100644 --- a/regression-test/suites/correctness/test_date_function_const.groovy +++ b/regression-test/suites/correctness/test_date_function_const.groovy @@ -57,5 +57,8 @@ suite("test_date_function_const") { qt_select10 """ select hours_add(cast('2023-03-30 22:23:45.23452' as datetimev2(6)),8) """ - + explain { + sql("""select date_add(CURRENT_DATE(),-2);""") + notContains("00:00:00") + } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
