refactor: SHOW statement, supporting any RDBMS specific implementation

manticore-projects · manticore-projects · commit daa56edb6ac6 · 2023-05-16T17:21:04.000+07:00
- returns any RDBMS specific implementation as `UnsupportedStatement` - fixes #1702
diff --git a/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java b/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
@@ -10,6 +10,7 @@
 
 package net.sf.jsqlparser.statement;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,19 +23,28 @@ public class UnsupportedStatement implements Statement {
     private List<String> declarations;
 
     public UnsupportedStatement(List<String> declarations) {
-        this.declarations = Objects.requireNonNull(declarations, "The List of Tokens must not be null.");
+        this.declarations =
+                Objects.requireNonNull(declarations, "The List of Tokens must not be null.");
     }
 
-     @Override
+    public UnsupportedStatement(String upfront, List<String> declarations) {
+        this.declarations = new ArrayList<>();
+        this.declarations.add(upfront);
+        this.declarations.addAll(
+                Objects.requireNonNull(declarations, "The List of Tokens must not be null."));
+    }
+
+    @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
     }
-    
-    @SuppressWarnings({"PMD.MissingBreakInSwitch", "PMD.SwitchStmtsShouldHaveDefault", "PMD.CyclomaticComplexity"})
+
+    @SuppressWarnings({"PMD.MissingBreakInSwitch", "PMD.SwitchStmtsShouldHaveDefault",
+            "PMD.CyclomaticComplexity"})
     public StringBuilder appendTo(StringBuilder builder) {
-        int i=0;
-        for (String s:declarations) {
-            if (i>0) {
+        int i = 0;
+        for (String s : declarations) {
+            if (i > 0) {
                 builder.append(" ");
             }
             builder.append(s);
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -682,15 +682,6 @@ Statement SingleStatement() :
             |
             stm = Reset()
             |
-            LOOKAHEAD(ShowColumns())
-            stm = ShowColumns()
-            |
-            LOOKAHEAD(ShowIndex())
-            stm = ShowIndex()
-            |
-            LOOKAHEAD(ShowTables())
-            stm = ShowTables()
-            |
             stm = Show()
             |
             stm = Use()
@@ -1170,11 +1161,40 @@ UseStatement Use(): {
     }
 }
 
+Statement Show():
+{
+    Statement statement;
+    List<String> captureRest;
+}
+{
+    <K_SHOW>
+    (
+        LOOKAHEAD(2) statement = ShowColumns()
+        |
+        LOOKAHEAD(2) statement = ShowIndex()
+        |
+        LOOKAHEAD(2) statement = ShowTables()
+        |
+        // any of the RDBMS specific SHOW syntax
+        captureRest = captureRest()
+        {
+            if (captureRest.size()==1) {
+                statement = new ShowStatement(captureRest.get(1));
+            } else {
+                statement = new UnsupportedStatement("SHOW", captureRest);
+            }
+        }
+    )
+    {
+        return statement;
+    }
+}
+
 ShowColumnsStatement ShowColumns(): {
     String tableName;
 }
 {
-    <K_SHOW> <K_COLUMNS> <K_FROM> tableName = RelObjectNameExt()
+    <K_COLUMNS> <K_FROM> tableName = RelObjectNameExt()
     {
         return new ShowColumnsStatement(tableName);
     }
@@ -1184,7 +1204,7 @@ ShowIndexStatement ShowIndex(): {
     String tableName;
 }
 {
-    <K_SHOW> <K_INDEX> <K_FROM> tableName = RelObjectNameExt()
+    <K_INDEX> <K_FROM> tableName = RelObjectNameExt()
     {
         return new ShowIndexStatement(tableName);
     }
@@ -1200,7 +1220,6 @@ ShowTablesStatement ShowTables(): {
     Expression whereCondition = null;
 }
 {
-  <K_SHOW>
   [ <K_EXTENDED> { modifiers.add(ShowTablesStatement.Modifiers.EXTENDED); } ]
   [ <K_FULL> { modifiers.add(ShowTablesStatement.Modifiers.FULL); } ]
   <K_TABLES>
@@ -1223,16 +1242,6 @@ ShowTablesStatement ShowTables(): {
   }
 }
 
-ShowStatement Show(): {
-    String name;
-}
-{
-    <K_SHOW> name = RelObjectNameExt()
-    {
-        return new ShowStatement(name);
-    }
-}
-
 Values Values(): {
     ExpressionList expressions;
 } {
diff --git a/src/test/java/net/sf/jsqlparser/statement/ShowStatementTest.java b/src/test/java/net/sf/jsqlparser/statement/ShowStatementTest.java
@@ -10,9 +10,10 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.JSQLParserException;
-import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
 import org.junit.jupiter.api.Test;
 
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
+
 /**
  *
  * @author oshai
@@ -28,4 +29,11 @@ public void testSimpleUse() throws JSQLParserException {
     public void testSimpleUse2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SHOW transaction_isolation");
     }
+
+    @Test
+    void testShowIndexesFromTable() throws JSQLParserException {
+        String sqlStr =
+                "show indexes from my_table";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -682,15 +682,6 @@ Statement SingleStatement() :`
`682`	`682`	`\|`
`683`	`683`	`stm = Reset()`
`684`	`684`	`\|`
`685`		`- LOOKAHEAD(ShowColumns())`
`686`		`- stm = ShowColumns()`
`687`		`- \|`
`688`		`- LOOKAHEAD(ShowIndex())`
`689`		`- stm = ShowIndex()`
`690`		`- \|`
`691`		`- LOOKAHEAD(ShowTables())`
`692`		`- stm = ShowTables()`
`693`		`- \|`
`694`	`685`	`stm = Show()`
`695`	`686`	`\|`
`696`	`687`	`stm = Use()`
`@@ -1170,11 +1161,40 @@ UseStatement Use(): {`
`1170`	`1161`	`}`
`1171`	`1162`	`}`
`1172`	`1163`
	`1164`	`+Statement Show():`
	`1165`	`+{`
	`1166`	`+ Statement statement;`
	`1167`	`+ List<String> captureRest;`
	`1168`	`+}`
	`1169`	`+{`
	`1170`	`+ <K_SHOW>`
	`1171`	`+ (`
	`1172`	`+ LOOKAHEAD(2) statement = ShowColumns()`
	`1173`	`+ \|`
	`1174`	`+ LOOKAHEAD(2) statement = ShowIndex()`
	`1175`	`+ \|`
	`1176`	`+ LOOKAHEAD(2) statement = ShowTables()`
	`1177`	`+ \|`
	`1178`	`+ // any of the RDBMS specific SHOW syntax`
	`1179`	`+ captureRest = captureRest()`
	`1180`	`+ {`
	`1181`	`+ if (captureRest.size()==1) {`
	`1182`	`+ statement = new ShowStatement(captureRest.get(1));`
	`1183`	`+ } else {`
	`1184`	`+ statement = new UnsupportedStatement("SHOW", captureRest);`
	`1185`	`+ }`
	`1186`	`+ }`
	`1187`	`+ )`
	`1188`	`+ {`
	`1189`	`+ return statement;`
	`1190`	`+ }`
	`1191`	`+}`
	`1192`	`+`
`1173`	`1193`	`ShowColumnsStatement ShowColumns(): {`
`1174`	`1194`	`String tableName;`
`1175`	`1195`	`}`
`1176`	`1196`	`{`
`1177`		`- <K_SHOW> <K_COLUMNS> <K_FROM> tableName = RelObjectNameExt()`
	`1197`	`+ <K_COLUMNS> <K_FROM> tableName = RelObjectNameExt()`
`1178`	`1198`	`{`
`1179`	`1199`	`return new ShowColumnsStatement(tableName);`
`1180`	`1200`	`}`
`@@ -1184,7 +1204,7 @@ ShowIndexStatement ShowIndex(): {`
`1184`	`1204`	`String tableName;`
`1185`	`1205`	`}`
`1186`	`1206`	`{`
`1187`		`- <K_SHOW> <K_INDEX> <K_FROM> tableName = RelObjectNameExt()`
	`1207`	`+ <K_INDEX> <K_FROM> tableName = RelObjectNameExt()`
`1188`	`1208`	`{`
`1189`	`1209`	`return new ShowIndexStatement(tableName);`
`1190`	`1210`	`}`
`@@ -1200,7 +1220,6 @@ ShowTablesStatement ShowTables(): {`
`1200`	`1220`	`Expression whereCondition = null;`
`1201`	`1221`	`}`
`1202`	`1222`	`{`
`1203`		`- <K_SHOW>`
`1204`	`1223`	`[ <K_EXTENDED> { modifiers.add(ShowTablesStatement.Modifiers.EXTENDED); } ]`
`1205`	`1224`	`[ <K_FULL> { modifiers.add(ShowTablesStatement.Modifiers.FULL); } ]`
`1206`	`1225`	`<K_TABLES>`
`@@ -1223,16 +1242,6 @@ ShowTablesStatement ShowTables(): {`
`1223`	`1242`	`}`
`1224`	`1243`	`}`
`1225`	`1244`
`1226`		`-ShowStatement Show(): {`
`1227`		`- String name;`
`1228`		`-}`
`1229`		`-{`
`1230`		`- <K_SHOW> name = RelObjectNameExt()`
`1231`		`- {`
`1232`		`- return new ShowStatement(name);`
`1233`		`- }`
`1234`		`-}`
`1235`		`-`
`1236`	`1245`	`Values Values(): {`
`1237`	`1246`	`ExpressionList expressions;`
`1238`	`1247`	`} {`