diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index bad4a870d5..f33e1e292e 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1476,6 +1476,8 @@ int32_t tscValidateName(SStrToken* pToken) {
     if (pToken->type == TK_STRING && validateQuoteToken(pToken) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_SQL;
     }
+    
+    strntolower(pToken->z, pToken->z, pToken->n);
 
     // re-build the whole name string
     if (pStr[firstPartLen] == TS_PATH_DELIMITER[0]) {
@@ -1488,6 +1490,8 @@ int32_t tscValidateName(SStrToken* pToken) {
     }
     pToken->n += (firstPartLen + sizeof(TS_PATH_DELIMITER[0]));
     pToken->z = pStr;
+
+    strntolower(pToken->z, 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 072fd740d4..48c5d4a1f9 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