From 60cd0395750a206e8de9f815e8051ffc9fd6b658 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 21 Oct 2021 16:45:54 +0800
Subject: [PATCH] [TD-10700]<enhance>: The escape char backstick can be used
 for both tag name and column name

---
 src/client/inc/tscUtil.h      | 1 +
 src/client/src/tscSQLParser.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 11ae6ae270..e2b151ea6a 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -251,6 +251,7 @@ void tscColumnListCopyAll(SArray* dst, const SArray* src);
 void convertQueryResult(SSqlRes* pRes, SQueryInfo* pQueryInfo, uint64_t objId, bool convertNchar);
 
 void tscDequoteAndTrimToken(SStrToken* pToken);
+void tscRmEscapeAndTrimToken(SStrToken* pToken);
 int32_t tscValidateName(SStrToken* pToken, bool escapeEnabled, bool *dbIncluded);
 
 void tscIncStreamExecutionCount(void* pStream);
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index ed6c81bff6..ef312b2f34 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -6606,6 +6606,9 @@ int32_t validateColumnName(char* name) {
     }
 
     return validateColumnName(token.z);
+  } else if (token.type == TK_ID) {
+    tscRmEscapeAndTrimToken(&token);
+    return TSDB_CODE_SUCCESS;
   } else {
     if (isNumber(&token)) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
-- 
GitLab