From 8eadd682185267ca53ced2215af1ad8abad4cf6f Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Tue, 17 May 2022 20:08:13 +0800 Subject: [PATCH] fix: some problems of parser for stmt mode --- source/libs/parser/src/parTranslater.c | 6 +++++- source/libs/parser/src/parser.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index e37a627f8d..07a0d357ba 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -3446,7 +3446,11 @@ static int32_t extractQueryResultSchema(const SNodeList* pProjections, int32_t* (*pSchema)[index].type = pExpr->resType.type; (*pSchema)[index].bytes = pExpr->resType.bytes; (*pSchema)[index].colId = index + 1; - strcpy((*pSchema)[index].name, pExpr->userAlias); + if ('\0' != pExpr->userAlias[0]) { + strcpy((*pSchema)[index].name, pExpr->userAlias); + } else { + strcpy((*pSchema)[index].name, pExpr->aliasName); + } index += 1; } diff --git a/source/libs/parser/src/parser.c b/source/libs/parser/src/parser.c index 213140806b..688e20063a 100644 --- a/source/libs/parser/src/parser.c +++ b/source/libs/parser/src/parser.c @@ -139,6 +139,7 @@ static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) { static EDealRes rewriteQueryExprAliasImpl(SNode* pNode, void* pContext) { if (nodesIsExprNode(pNode) && QUERY_NODE_COLUMN != nodeType(pNode) && '\0' == ((SExprNode*)pNode)->userAlias[0]) { + strcpy(((SExprNode*)pNode)->userAlias, ((SExprNode*)pNode)->aliasName); sprintf(((SExprNode*)pNode)->aliasName, "#%d", *(int32_t*)pContext); ++(*(int32_t*)pContext); }