JSQLParser · manticore-projects · Dec 23, 2023 · Dec 23, 2023 · Dec 23, 2023 · Dec 23, 2023
diff --git a/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java b/src/main/java/net/sf/jsqlparser/parser/feature/Feature.java
@@ -593,6 +593,14 @@ public enum Feature {
      * @see DescribeStatement
      */
     describe,
+
+    /**
+     * SQL "DESC" statement is allowed
+     *
+     * @see DescribeStatement
+     */
+    desc,
+
     /**
      * SQL "EXPLAIN" statement is allowed
      *

diff --git a/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java b/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
@@ -14,6 +14,7 @@
 public class DescribeStatement implements Statement {
 
     private Table table;
+    private String describeType;
 
     public DescribeStatement() {
         // empty constructor
@@ -33,7 +34,7 @@ public void setTable(Table table) {
 
     @Override
     public String toString() {
-        return "DESCRIBE " + table.getFullyQualifiedName();
+        return this.describeType + " " + table.getFullyQualifiedName();
     }
 
     @Override
@@ -45,4 +46,13 @@ public DescribeStatement withTable(Table table) {
         this.setTable(table);
         return this;
     }
+
+    public String getDescribeType() {
+        return describeType;
+    }
+
+    public DescribeStatement setDescribeType(String describeType) {
+        this.describeType = describeType;
+        return this;
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java b/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
@@ -9,11 +9,11 @@
  */
 package net.sf.jsqlparser.statement;
 
-import net.sf.jsqlparser.statement.select.Select;
-
 import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.select.Select;
 
 /**
  * An {@code EXPLAIN} statement
@@ -22,11 +22,21 @@ public class ExplainStatement implements Statement {
 
     private Select select;
     private LinkedHashMap<OptionType, Option> options;
+    private Table table;
 
     public ExplainStatement() {
         // empty constructor
     }
 
+    public Table getTable() {
+        return table;
+    }
+
+    public ExplainStatement setTable(Table table) {
+        this.table = table;
+        return this;
+    }
+
     public ExplainStatement(Select select) {
         this.select = select;
     }
@@ -68,14 +78,21 @@ public Option getOption(OptionType optionType) {
     @Override
     public String toString() {
         StringBuilder statementBuilder = new StringBuilder("EXPLAIN");
-        if (options != null) {
+        if (table != null) {
+            statementBuilder.append(" ").append(table);
+        } else {
+            if (options != null) {
+                statementBuilder.append(" ");
+                statementBuilder.append(options.values().stream().map(Option::formatOption)
+                        .collect(Collectors.joining(" ")));
+            }
+
             statementBuilder.append(" ");
-            statementBuilder.append(options.values().stream().map(Option::formatOption)
-                    .collect(Collectors.joining(" ")));
+            if (select != null) {
+                statementBuilder.append(select.toString());
+            }
         }
 
-        statementBuilder.append(" ");
-        statementBuilder.append(select.toString());
         return statementBuilder.toString();
     }
 

diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -1067,7 +1067,9 @@ public void visit(DescribeStatement describe) {
 
     @Override
     public void visit(ExplainStatement explain) {
-        explain.getStatement().accept((StatementVisitor) this);
+        if (explain.getStatement() != null) {
+            explain.getStatement().accept((StatementVisitor) this);
+        }
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
@@ -9,6 +9,9 @@
  */
 package net.sf.jsqlparser.util.deparser;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.sf.jsqlparser.statement.Block;
 import net.sf.jsqlparser.statement.Commit;
 import net.sf.jsqlparser.statement.CreateFunctionalStatement;
@@ -59,10 +62,6 @@
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.statement.upsert.Upsert;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class StatementDeParser extends AbstractDeParser<Statement> implements StatementVisitor {
 
     private final ExpressionDeParser expressionDeParser;
@@ -347,19 +346,25 @@ public void visit(Comment comment) {
 
     @Override
     public void visit(DescribeStatement describe) {
-        buffer.append("DESCRIBE ");
+        buffer.append(describe.getDescribeType());
+        buffer.append(" ");
         buffer.append(describe.getTable());
     }
 
     @Override
     public void visit(ExplainStatement explain) {
         buffer.append("EXPLAIN ");
-        if (explain.getOptions() != null) {
+        if (explain.getTable() != null) {
+            buffer.append(explain.getTable());
+        } else if (explain.getOptions() != null) {
             buffer.append(explain.getOptions().values().stream()
                     .map(ExplainStatement.Option::formatOption).collect(Collectors.joining(" ")));
             buffer.append(" ");
         }
-        explain.getStatement().accept(this);
+        if (explain.getStatement() != null) {
+            explain.getStatement().accept(this);
+
+        }
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/util/validation/feature/MySqlVersion.java b/src/main/java/net/sf/jsqlparser/util/validation/feature/MySqlVersion.java
@@ -115,6 +115,7 @@ public enum MySqlVersion implements Version {
 
                     // https://dev.mysql.com/doc/refman/8.0/en/describe.html
                     Feature.describe,
+                    Feature.desc,
                     // https://dev.mysql.com/doc/refman/8.0/en/explain.html
                     Feature.explain,
                     // https://dev.mysql.com/doc/refman/8.0/en/show.html

diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java
@@ -209,13 +209,16 @@ public void visit(Comment comment) {
     @Override
     public void visit(DescribeStatement describe) {
         validateFeature(Feature.describe);
+        validateFeature(Feature.desc);
         validateOptionalFromItem(describe.getTable());
     }
 
     @Override
     public void visit(ExplainStatement explain) {
         validateFeature(Feature.explain);
-        explain.getStatement().accept(this);
+        if (explain.getStatement() != null) {
+            explain.getStatement().accept(this);
+        }
     }
 
 

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1056,29 +1056,43 @@ PurgeStatement PurgeStatement(): {
 
 DescribeStatement Describe(): {
     Table table;
+    DescribeStatement stmt = new DescribeStatement();
+    Token tk = null;
 } {
-    <K_DESCRIBE> table = Table()
+    (tk=<K_DESCRIBE> | tk=<K_DESC>) 
+    table = Table() { stmt.setDescribeType(tk.image).setTable(table); }
     {
-        return new DescribeStatement(table);
+        return stmt;
     }
 }
 
 ExplainStatement Explain(): {
     Select select;
+    Table table = null;
     List<ExplainStatement.Option> options = null;
+    ExplainStatement es = new ExplainStatement();
 } {
     <K_EXPLAIN>
-    options=ExplainStatementOptions()
-    select = Select( )
-    {
-       ExplainStatement es = new ExplainStatement(select);
-       if(options != null && !options.isEmpty()) {
-         for(ExplainStatement.Option o : options) {
-           es.addOption(o);
-         }
-       }
-       return es;
-    }
+    (
+        LOOKAHEAD(3)(
+            options=ExplainStatementOptions()
+            select = Select( )
+            {
+               es.setStatement(select);
+               if (options != null && !options.isEmpty()) {
+                 for(ExplainStatement.Option o : options) {
+                   es.addOption(o);
+                 }
+               }
+            }
+        )
+        |
+        (
+           table=Table( ) { es.setTable(table); }
+        )
+
+    )
+    { return es; }
 }
 
 /**

diff --git a/src/test/java/net/sf/jsqlparser/statement/DescribeTest.java b/src/test/java/net/sf/jsqlparser/statement/DescribeTest.java
@@ -9,8 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-import net.sf.jsqlparser.JSQLParserException;
 import static net.sf.jsqlparser.test.TestUtils.*;
+
+import net.sf.jsqlparser.JSQLParserException;
 import org.junit.jupiter.api.Test;
 
 public class DescribeTest {
@@ -20,6 +21,12 @@ public void testDescribe() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DESCRIBE foo.products");
     }
 
+    @Test
+    public void testDescribeIssue1931() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("DESC table_name");
+        assertSqlCanBeParsedAndDeparsed("EXPLAIN table_name");
+    }
+
     @Test
     public void testDescribeIssue1212() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DESCRIBE file_azbs.productcategory.json");

diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/StatementValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/StatementValidatorTest.java
@@ -29,11 +29,19 @@ public void testValidateCreateSchema() throws JSQLParserException {
 
     @Test
     public void testValidateCreateSchemaNotAllowed() throws JSQLParserException {
-        for (String sql : Arrays.asList("CREATE SCHEMA my_schema", "CREATE SCHEMA myschema AUTHORIZATION myauth")) {
+        for (String sql : Arrays.asList("CREATE SCHEMA my_schema",
+                "CREATE SCHEMA myschema AUTHORIZATION myauth")) {
             validateNotAllowed(sql, 1, 1, FeaturesAllowed.DML, Feature.createSchema);
         }
     }
 
+    @Test
+    public void testValidateDescNoErrors() throws JSQLParserException {
+        for (String sql : Arrays.asList("DESC table_name", "EXPLAIN table_name")) {
+            validateNoErrors(sql, 1, DatabaseType.MYSQL);
+        }
+    }
+
     @Test
     public void testValidateTruncate() throws JSQLParserException {
         validateNoErrors("TRUNCATE TABLE my_table", 1, DatabaseType.DATABASES);
@@ -53,7 +61,8 @@ public void testValidateBlock() throws JSQLParserException {
     @Test
     public void testValidateComment() throws JSQLParserException {
         for (String sql : Arrays.asList("COMMENT ON VIEW myschema.myView IS 'myComment'",
-                "COMMENT ON COLUMN myTable.myColumn is 'Some comment'", "COMMENT ON TABLE table1 IS 'comment1'")) {
+                "COMMENT ON COLUMN myTable.myColumn is 'Some comment'",
+                "COMMENT ON TABLE table1 IS 'comment1'")) {
             validateNoErrors(sql, 1, DatabaseType.H2, DatabaseType.ORACLE, DatabaseType.POSTGRESQL);
         }
     }

diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/explain01.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/explain01.sql
@@ -16,4 +16,5 @@ explain plan
            (select department_id from departments
                where location_id = 1700)
 
---@FAILURE: Encountered unexpected token: "plan" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "plan" <S_IDENTIFIER> recorded first on Aug 3, 2021, 7:20:08 AM
+--@FAILURE: Encountered unexpected token: "set" "SET" recorded first on 2023年12月23日 下午1:38:33