From 53d3b59a51f68879ecd13b45dd9f6873f2d33a2e Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Wed, 8 Dec 2021 09:27:42 +0800
Subject: [PATCH] [TS-810]

---
 src/client/src/tscSQLParser.c            |  2 +-
 tests/script/general/parser/function.sim | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index b198070525..85440fd58b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7264,7 +7264,7 @@ int32_t validateFunctionFromUpstream(SQueryInfo* pQueryInfo, char* msg) {
         SQueryInfo* pUp = taosArrayGetP(pQueryInfo->pUpstream, j);
         STableMetaInfo  *pTableMetaInfo = tscGetMetaInfo(pUp, 0);
         bool isSTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
-        if ((!isSTable) || groupbyTbname(pUp)) {
+        if ((!isSTable) || groupbyTbname(pUp) || pUp->interval.interval > 0) {
           return TSDB_CODE_SUCCESS;
         }
       }
diff --git a/tests/script/general/parser/function.sim b/tests/script/general/parser/function.sim
index 48e52cc7d7..94f75962b4 100644
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
@@ -1197,3 +1197,16 @@ if $data00 != 0.000000000 then
   return -1
 endi
 
+sql select derivative(aa,1m,0) from (select avg(voltage) as aa from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10 interval(1000a));
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @21-08-08 10:10:12.000@ then
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+
+
-- 
GitLab