Skip to content

[fix](planner)date_add function should accept date type as its param #34035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starocean999 merged 1 commit into from
Apr 26, 2024
Merged

[fix](planner)date_add function should accept date type as its param #34035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,6 +1658,22 @@ && collectChildReturnTypes()[0].isDecimalV3()) {
}
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) {
Expand Down
2 changes: 2 additions & 0 deletions gensrc/script/doris_builtins_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,8 @@
[['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'], ''],
Expand Down
5 changes: 4 additions & 1 deletion regression-test/suites/correctness/test_date_function_const.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}