From a10e6457bf173d8ed0587c6574547f4d39d3c269 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Fri, 25 Oct 2024 14:00:32 +0800
Subject: [PATCH] fix: blank and double quotes

---
 tools/shell/src/shellAuto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/shell/src/shellAuto.c b/tools/shell/src/shellAuto.c
index defbf1cb82..2b203953dd 100644
--- a/tools/shell/src/shellAuto.c
+++ b/tools/shell/src/shellAuto.c
@@ -229,7 +229,7 @@ SWords shellCommands[] = {
 
 // where keyword
 char* keywords[] = {
-    "and ",         "asc ",      "desc ",     "from ",    "fill(",         "limit ",    "where ",
+    "where ",       "and ",      "asc ",      "desc ",    "from ",         "fill(",     "limit ",
     "interval(",    "order by ", "order by ", "offset ",  "or ",           "group by ", "now()",
     "session(",     "sliding ",  "slimit ",   "soffset ", "state_window(", "today() ",  "union all select ",
     "partition by ", "match",    "nmatch ",    "between ",  "like ",           "is null ",   "is not null ",
@@ -1330,7 +1330,7 @@ void printScreen(TAOS* con, SShellCmd* cmd, SWords* match) {
     lastWordBytes = word->len;
   }
 
-  if (word->end) {
+  if (word->end && str[strLen - 1] != ';') {
     // append end ';'
     char *p = taosMemoryMalloc(strLen + 8);
     strcpy(p, str);