From e7215c5a2462db5871df1e5348222e911b2d402f Mon Sep 17 00:00:00 2001 From: lyh250-666 Date: Fri, 11 Oct 2024 16:51:09 +0800 Subject: [PATCH] opti:modify common type between numbers and string --- source/libs/parser/src/parTranslater.c | 4 ++-- tests/script/tsim/scalar/caseWhen.sim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index a5e702976f..bb98891b70 100755 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -3244,14 +3244,14 @@ static EDealRes translateCaseWhen(STranslateContext* pCxt, SCaseWhenNode* pCaseW } allNullThen = false; if (!selectCommonType(&pCaseWhen->node.resType, &pThenExpr->resType)) { - pCxt->errCode = DEAL_RES_ERROR; + pCxt->errCode = TSDB_CODE_SCALAR_CONVERT_ERROR; return DEAL_RES_ERROR; } } SExprNode* pElseExpr = (SExprNode*)pCaseWhen->pElse; if (pElseExpr && !selectCommonType(&pCaseWhen->node.resType, &pElseExpr->resType)) { - pCxt->errCode = DEAL_RES_ERROR; + pCxt->errCode = TSDB_CODE_SCALAR_CONVERT_ERROR; return DEAL_RES_ERROR; } diff --git a/tests/script/tsim/scalar/caseWhen.sim b/tests/script/tsim/scalar/caseWhen.sim index 7b4c875675..211e43a660 100644 --- a/tests/script/tsim/scalar/caseWhen.sim +++ b/tests/script/tsim/scalar/caseWhen.sim @@ -1144,4 +1144,4 @@ sql_error select case when c_double > 100 then c_varbinary else c_geometry end a sql_error select case when ts > '2022-01-01 00:00:00' then c_bool else c_geometry end as result from t_test; sql_error select case when c_bool then c_double else c_varbinary end as result from t_test; - +system sh/exec.sh -n dnode1 -s stop -x SIGINT