diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c
index dd0e6db8761eb3bc768a609164b08059848ab2fe..f94c523c5a67c088cfb42eec4d6e0285f1f42cd6 100644
--- a/src/query/src/qSqlParser.c
+++ b/src/query/src/qSqlParser.c
@@ -68,9 +68,6 @@ SSqlInfo qSqlParse(const char *pStr) {
         sqlInfo.valid = false;
         goto abort_parse;
       }
-      case TK_ID:
-        tscRmEscapeAndTrimToken(&t0);
-        //fall through
       default:
         Parse(pParser, t0.type, t0, &sqlInfo);
         if (sqlInfo.valid == false) {
@@ -621,6 +618,9 @@ void tSetDbName(SStrToken *pCpxName, SStrToken *pDb) {
 
 void tSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType) {
   int32_t maxLen = sizeof(pField->name) / sizeof(pField->name[0]);
+  if (pName->type == TK_ID) {
+    tscRmEscapeAndTrimToken(pName);
+  }
 
   // column name is too long, set the it to be invalid.
   if ((int32_t) pName->n >= maxLen) {