diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index ec699408de943f228e2c0aa7057f265bc9fc446a..4811a3b35d3fc15be5af78cff8d420868637da9b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5427,6 +5427,7 @@ int32_t validateColumnName(char* name) {
 
   if (token.type == TK_STRING) {
     strdequote(token.z);
+    strntolower(token.z, token.z, token.n);
     token.n = (uint32_t)strtrim(token.z);
 
     int32_t k = tSQLGetToken(token.z, &token.type);
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 0d7ac917aa45ac92f51d0844e165d306bfa8bb75..83d9dd805cb006ad4728f2adadffbabc7da128f6 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -32,6 +32,14 @@
 static void freeQueryInfoImpl(SQueryInfo* pQueryInfo);
 static void clearAllTableMetaInfo(SQueryInfo* pQueryInfo);
 
+static void tscStrToLower(char *str, int32_t n) {
+  if (str == NULL || n <= 0) { return;}
+  for (int32_t i = 0; i < n; i++) {
+    if (str[i] >= 'A' && str[i] <= 'Z') {
+        str[i] -= ('A' - 'a');
+    }
+  }
+}
 SCond* tsGetSTableQueryCond(STagCond* pTagCond, uint64_t uid) {
   if (pTagCond->pCond == NULL) {
     return NULL;
@@ -1413,9 +1421,11 @@ int32_t tscValidateName(SStrToken* pToken) {
   char* sep = strnchr(pToken->z, TS_PATH_DELIMITER[0], pToken->n, true);
   if (sep == NULL) {  // single part
     if (pToken->type == TK_STRING) {
+       
       strdequote(pToken->z);
+      tscStrToLower(pToken->z, pToken->n);
       pToken->n = (uint32_t)strtrim(pToken->z);
-
+       
       int len = tSQLGetToken(pToken->z, &pToken->type);
 
       // single token, validate it
@@ -1467,7 +1477,7 @@ int32_t tscValidateName(SStrToken* pToken) {
     if (pToken->type == TK_STRING && validateQuoteToken(pToken) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_SQL;
     }
-
+    
     // re-build the whole name string
     if (pStr[firstPartLen] == TS_PATH_DELIMITER[0]) {
       // first part do not have quote do nothing
@@ -1479,6 +1489,8 @@ int32_t tscValidateName(SStrToken* pToken) {
     }
     pToken->n += (firstPartLen + sizeof(TS_PATH_DELIMITER[0]));
     pToken->z = pStr;
+
+    tscStrToLower(pToken->z,pToken->n);
   }
 
   return TSDB_CODE_SUCCESS;
diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim
index 072fd740d4d2960891c774a4e24a999c477ebc96..48c5d4a1f94337a6324826d78eda3ad498ac3d76 100644
--- a/tests/script/general/parser/dbtbnameValidate.sim
+++ b/tests/script/general/parser/dbtbnameValidate.sim
@@ -26,11 +26,11 @@ sql use ' XYZ '
 
 sql drop database 'abc123'
 sql drop database '_ab1234'
-sql drop database 'ABC123'
+sql_error drop database 'ABC123'
 sql drop database '_ABC123'
 sql drop database 'aABb123'
 sql drop database ' xyz '
-sql drop database ' XYZ '
+sql_error drop database ' XYZ '
 
 
 sql use abc
@@ -67,9 +67,9 @@ sql describe mt
 sql describe sub_001
 sql describe sub_dy_tbl
 
-sql_error describe Dd
-sql_error describe FF
-sql_error describe gG
+sql describe Dd
+sql describe FF
+sql describe gG
 
 sql drop table abc.cc
 sql drop table  'abc.Dd'
@@ -119,4 +119,4 @@ if $rows != 4 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT