xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

opti:update case

This commit is contained in:
lyh250-666 2024-10-09 19:14:45 +08:00
parent 945b4e4479
commit 1388ce32f6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/libs/parser/src/parTranslater.c
View File

@ -3222,24 +3222,24 @@ static bool selectCommonType(SDataType* commonType, const SDataType* newType) {
// type 6, float >= float, bool, tinyint, smallint, utinyint, usmallint // type 6, float >= float, bool, tinyint, smallint, utinyint, usmallint
if ((commonType->type == TSDB_DATA_TYPE_FLOAT && if ((commonType->type == TSDB_DATA_TYPE_FLOAT &&
((newType->type >= TSDB_DATA_TYPE_BOOL && newType->type < TSDB_DATA_TYPE_INT) || ((newType->type >= TSDB_DATA_TYPE_BOOL && newType->type <= TSDB_DATA_TYPE_INT) ||
newType->type == TSDB_DATA_TYPE_UTINYINT || newType->type == TSDB_DATA_TYPE_USMALLINT))|| (newType->type >= TSDB_DATA_TYPE_UTINYINT || newType->type <= TSDB_DATA_TYPE_UINT)))||
(newType->type == TSDB_DATA_TYPE_FLOAT && (newType->type == TSDB_DATA_TYPE_FLOAT &&
((commonType->type >= TSDB_DATA_TYPE_BOOL && commonType->type < TSDB_DATA_TYPE_INT) || ((commonType->type >= TSDB_DATA_TYPE_BOOL && commonType->type <= TSDB_DATA_TYPE_INT) ||
commonType->type == TSDB_DATA_TYPE_UTINYINT || commonType->type == TSDB_DATA_TYPE_USMALLINT))) { (newType->type >= TSDB_DATA_TYPE_UTINYINT || newType->type <= TSDB_DATA_TYPE_UINT)))) {
*commonType = (commonType->type == TSDB_DATA_TYPE_FLOAT) ? *commonType : *newType; *commonType = (commonType->type == TSDB_DATA_TYPE_FLOAT) ? *commonType : *newType;
return true; return true;
} }
//type 7, double >= double bool, tinyint, smallint, int, utinyint, usmallint, uint, //type 7, double >= double bool, tinyint, smallint, int, utinyint, usmallint, uint,
if ((commonType->type == TSDB_DATA_TYPE_DOUBLE && if ((commonType->type == TSDB_DATA_TYPE_DOUBLE &&
((newType->type >= TSDB_DATA_TYPE_BOOL && newType->type < TSDB_DATA_TYPE_BIGINT) || ((newType->type >= TSDB_DATA_TYPE_BOOL && newType->type <= TSDB_DATA_TYPE_BIGINT) ||
newType->type == TSDB_DATA_TYPE_FLOAT || newType->type == TSDB_DATA_TYPE_FLOAT ||
(newType->type >= TSDB_DATA_TYPE_UTINYINT && newType->type < TSDB_DATA_TYPE_UBIGINT) || (newType->type >= TSDB_DATA_TYPE_UTINYINT && newType->type <= TSDB_DATA_TYPE_UBIGINT) ||
newType->type == TSDB_DATA_TYPE_DOUBLE)) || newType->type == TSDB_DATA_TYPE_DOUBLE)) ||
(newType->type == TSDB_DATA_TYPE_DOUBLE && (newType->type == TSDB_DATA_TYPE_DOUBLE &&
((commonType->type >= TSDB_DATA_TYPE_BOOL && commonType->type < TSDB_DATA_TYPE_BIGINT) || ((commonType->type >= TSDB_DATA_TYPE_BOOL && commonType->type <= TSDB_DATA_TYPE_BIGINT) ||
commonType->type == TSDB_DATA_TYPE_FLOAT || commonType->type == TSDB_DATA_TYPE_FLOAT ||
(commonType->type >= TSDB_DATA_TYPE_UTINYINT && commonType->type < TSDB_DATA_TYPE_UBIGINT) || (commonType->type >= TSDB_DATA_TYPE_UTINYINT && commonType->type <= TSDB_DATA_TYPE_UBIGINT) ||
commonType->type == TSDB_DATA_TYPE_DOUBLE))) { commonType->type == TSDB_DATA_TYPE_DOUBLE))) {
*commonType = (commonType->type == TSDB_DATA_TYPE_DOUBLE) ? *commonType : *newType; *commonType = (commonType->type == TSDB_DATA_TYPE_DOUBLE) ? *commonType : *newType;
return true; return true;

2
tests/script/tsim/scalar/caseWhen.sim
View File

@ -423,7 +423,7 @@ endi
if $data20 != @1970-01-01 08:00:00.003@ then if $data20 != @1970-01-01 08:00:00.003@ then
return -1 return -1
endi endi
if $data30 != @2022-09-26 15:15:04.0@ then if $data30 != @2022-09-26 15:15:04.000@ then
return -1 return -1
endi endi