diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 414ff32acfcd5ea76f3d44f59a1ed10daacd81e7..9f18a5cd6779a12b50b331d16bd90735ae05a6e4 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8685,7 +8685,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf const char* msg4 = "interval query not supported, since the result of sub query not include valid timestamp column"; const char* msg5 = "only tag query not compatible with normal column filter"; const char* msg6 = "not support stddev/percentile/interp in the outer query yet"; - const char* msg7 = "derivative/twa/rate/irate/diff requires timestamp column exists in subquery"; + const char* msg7 = "derivative/twa/rate/irate/diff/top/bottom requires timestamp column exists in subquery"; const char* msg8 = "condition missing for join query"; const char* msg9 = "not support 3 level select"; @@ -8769,7 +8769,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf SExprInfo* pExpr = tscExprGet(pQueryInfo, i); int32_t f = pExpr->base.functionId; - if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || f == TSDB_FUNC_RATE || f== TSDB_FUNC_DIFF) { + if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || f == TSDB_FUNC_RATE || + f == TSDB_FUNC_DIFF || f == TSDB_FUNC_TOP || f == TSDB_FUNC_BOTTOM ) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7); } } diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim index 79052c3ea452fd6b70588030e2ec21c0570f2415..799334f4aa577638d7c004e88275bf3516dfed80 100644 --- a/tests/script/general/parser/nestquery.sim +++ b/tests/script/general/parser/nestquery.sim @@ -330,9 +330,9 @@ if $data12 != 71680.000000000 then return -1 endi -sql select top(x, 20) from (select c1 x from nest_tb0); +sql select top(x, 20) from (select ts,c1 x from nest_tb0); -sql select bottom(x, 20) from (select c1 x from nest_tb0) +sql select bottom(x, 20) from (select ts,c1 x from nest_tb0) print ===================> group by + having @@ -407,12 +407,17 @@ if $data03 != @20-09-15 00:00:00.000@ then return -1 endi +sql_error select diff(val) from (select c1 val from nest_tb0); + sql select diff(val) from (select ts,c1 val from nest_tb0); if $rows != 9999 then return -1 endi -if $data00 != @70-01-01 08:00:00.000@ then +print data00 = $data00 +print data00 = $data01 + +if $data00 != @20-09-15 00:01:00.000@ then return -1 endi