Merge pull request #19108 from taosdata/fix/main_bugfix_wxy

fix: keepColumnName parameter changes the user alias

include/libs/nodes/querynodes.h

@@ -51,6 +51,7 @@ typedef struct SExprNode {
   char      userAlias[TSDB_COL_NAME_LEN];
   SArray*   pAssociation;
   bool      orderAlias;
+  bool      asAlias;
 } SExprNode;
 
 typedef enum EColumnType {

source/libs/parser/src/parAstCreater.c

@@ -680,6 +680,7 @@ SNode* setProjectionAlias(SAstCreateContext* pCxt, SNode* pNode, SToken* pAlias)
   pExpr->aliasName[len] = '\0';
   strncpy(pExpr->userAlias, pAlias->z, len);
   pExpr->userAlias[len] = '\0';
+  pExpr->asAlias = true;
   return pNode;
 }
 

source/libs/parser/src/parTranslater.c

@@ -1579,7 +1579,7 @@ static int32_t translateMultiResFunc(STranslateContext* pCxt, SFunctionNode* pFu
                                      "%s(*) is only supported in SELECTed list", pFunc->functionName);
     }
   }
-  if (tsKeepColumnName && 1 == LIST_LENGTH(pFunc->pParameterList)) {
+  if (tsKeepColumnName && 1 == LIST_LENGTH(pFunc->pParameterList) && !pFunc->node.asAlias) {
     strcpy(pFunc->node.userAlias, ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->userAlias);
   }
   return TSDB_CODE_SUCCESS;