From b33916be9f568ea7f9267d6da7ec3d8d8e331b73 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Mon, 28 Jun 2021 14:57:04 +0800
Subject: [PATCH] [TD-4825]<feature> order by col after group-by

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 5884d18ee7..f4eb5a3c2e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5179,7 +5179,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
     SArray *columnInfo = pQueryInfo->groupbyExpr.columnInfo;
     if (columnInfo != NULL && taosArrayGetSize(columnInfo) > 0) {
       SColIndex* pColIndex = taosArrayGet(columnInfo, 0);
-      if (pColIndex->colIndex == index.columnIndex) {
+      if (PRIMARYKEY_TIMESTAMP_COL_INDEX != index.columnIndex && pColIndex->colIndex == index.columnIndex) {
         orderByGroupbyCol = true; 
       }
     } 
-- 
GitLab