fix(shell): describe show command need show whole result

2481f1cd · Alex Duan · 1a1ce767 · 2481f1cd
隐藏空白更改
内联并排

Showing with 13 addition and 4 deletion

tools/shell/src/shellEngine.c tools/shell/src/shellEngine.c +13 -4

未找到文件。
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -540,11 +540,20 @@ void shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t
  }
 }
-bool shellIsLimitQuery(const char *sql) {
+// show whole result for this query return true, like limit or describe
-  // todo refactor
+bool shellIsShowWhole(const char *sql) {
+  // limit
  if (taosStrCaseStr(sql, " limit ") != NULL) {
    return true;
  }
+  // describe
+  if (taosStrCaseStr(sql, "describe ") != NULL) {
+    return true;
+  }
+  // describe
+  if (taosStrCaseStr(sql, "show ") != NULL) {
+    return true;
+  }
  return false;
 }
@@ -578,7 +587,7 @@ int32_t shellVerticalPrintResult(TAOS_RES *tres, const char *sql) {
  uint64_t resShowMaxNum = UINT64_MAX;
-  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsLimitQuery(sql)) {
+  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsShowWhole(sql)) {
    resShowMaxNum = SHELL_DEFAULT_RES_SHOW_NUM;
  }
@@ -723,7 +732,7 @@ int32_t shellHorizontalPrintResult(TAOS_RES *tres, const char *sql) {
  uint64_t resShowMaxNum = UINT64_MAX;
-  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsLimitQuery(sql)) {
+  if (shell.args.commands == NULL && shell.args.file[0] == 0 && !shellIsShowWhole(sql)) {
    resShowMaxNum = SHELL_DEFAULT_RES_SHOW_NUM;
  }