merge conflict

DTStack · Sep 6, 2023 · 284958a · 284958a
2 parents 2f18651 + 885b85e
commit 284958a
Show file tree

Hide file tree

Showing 28 changed files with 5,938 additions and 5,628 deletions.
diff --git a/src/grammar/hive/HiveSqlParser.g4 b/src/grammar/hive/HiveSqlParser.g4
@@ -346,6 +346,7 @@ showStatement
     | KW_SHOW KW_CONF StringLiteral
     | KW_SHOW KW_RESOURCE (KW_PLAN rp_name=id_ | KW_PLANS)
     | KW_SHOW KW_DATACONNECTORS
+    | KW_SHOW KW_FORMATTED? ( KW_INDEX | KW_INDEXES ) KW_ON tableName (from_in id_)?
     ;
 
 showTablesFilterExpr

diff --git a/src/lib/hive/HiveSqlParser.interp b/src/lib/hive/HiveSqlParser.interp