Merge branch 'main' into add-release-notes-for-opensearch-ga

opensearch-project · Jul 1, 2021 · 6b2fb7c · 6b2fb7c
2 parents 1233397 + 399881d
commit 6b2fb7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -72,7 +72,7 @@ adminStatement
     ;
 
 showStatement
-    : SHOW TABLES tableFilter?
+    : SHOW TABLES tableFilter
     ;
 
 describeStatement

diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java
@@ -160,4 +160,9 @@ public void canParseOrderByClause() {
         "SELECT name, age FROM test ORDER BY name ASC NULLS FIRST, age DESC NULLS LAST"));
   }
 
+  @Test
+  public void canNotParseShowStatementWithoutFilterClause() {
+    assertThrows(SyntaxCheckException.class, () -> parser.parse("SHOW TABLES"));
+  }
+
 }