Merge master into user-variable-assignment

Author: wumpz

README.md

@@ -22,6 +22,7 @@ Please provide feedback on:
 * API changes: extend visitor with return values (https://github.com/JSQLParser/JSqlParser/issues/901)
 
 ## News
+* Released version **3.2** of JSqlParser
 * Released version **3.1** of JSqlParser
 * Released version **3.0** of JSqlParser
 * The array parsing is the default behaviour. Square bracket quotation has to be enabled using 
@@ -64,32 +65,9 @@ To help JSqlParser's development you are encouraged to provide
 
 Also I would like to know about needed examples or documentation stuff.
 
-## Extensions in the latest SNAPSHOT version 3.2
-
-* added options to **EXPLAIN** statement 
-* preserved input of **&&** and avoid translation to **AND**
-* added multi values in **IN** expression
-* added **COMMENT** support for **ALTER TABLE** statement
-* added some **FOREIGN KEY** definition improvments
-* allow **VALIDATE** as column name
-* first support for **CREATE SCHEMA** and **DROP SCHEMA**
-* allow **ON** as a value in a set statement (`SET myvalue = ON`)
-* support for **ALTER TABLE ONLY mytable ...**
-* allow foreign key definition in alter statements without referenced columns specification
-* allow datatype **binary** for column definitions
-* support for **ALTER TABLE COLUMN DROP NOT NULL**
-* allow **order** as column name
-* support for table function in **IN** expression
-* allow complex expressions within all of a **case when** statement
-* support for parameters in **create index** statement
-* support for integer parameters for **->>** and **->** JSON expressions
-* support for more keywords in following parts of multipart object names (e.g. **mytab.select, mytab.create, ...**)
-* support for **OUTER APPLY**
-* support for **WITH(NOLOCK)**
-* support for **VIEW** as object name
-* functions hold now multipart names
-* support for **DISABLE** as object name
-* API change in `ColumnDefinition.setColumnSpecStrings` to `ColumnDefinition.setColumnSpecs` to better allow the merge between `AlterExpression.ColumnDataType` and `ColumnDefinition`
+## Extensions in the latest SNAPSHOT version 3.3
+
+* allowed Jdbc named parameters within interval expressions
 
 ## Extensions of JSqlParser releases
 

nb-configuration.xml

@@ -13,7 +13,7 @@
 		That way multiple projects can share the same settings (useful for formatting rules for example).
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
-        <netbeans.compile.on.save>all</netbeans.compile.on.save>
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
         <com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
         <com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
         <com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.jsqlparser</groupId>
     <artifactId>jsqlparser</artifactId>
-    <version>3.2-SNAPSHOT</version>
+    <version>3.3-SNAPSHOT</version>
     <name>JSQLParser library</name> 
     <inceptionYear>2004</inceptionYear>
     <organization>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.11.1</version>
+            <version>3.16.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -246,6 +246,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M4</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
             </plugin>
         </plugins>
     </build>

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -172,8 +172,10 @@ public void visit(InExpression expr) {
         }
         if (expr.getRightExpression() != null) {
             expr.getRightExpression().accept(this);
-        } else {
+        } else if (expr.getRightItemsList() != null) {
             expr.getRightItemsList().accept(this);
+        } else {
+            expr.getMultiExpressionList().accept(this);
         }
     }
 

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -26,6 +26,7 @@
 import net.sf.jsqlparser.statement.merge.Merge;
 import net.sf.jsqlparser.statement.replace.Replace;
 import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.show.ShowTablesStatement;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.statement.upsert.Upsert;
@@ -69,6 +70,8 @@ public interface StatementVisitor {
 
     void visit(ShowColumnsStatement set);
 
+    void visit(ShowTablesStatement showTables);
+
     void visit(Merge merge);
 
     void visit(Select select);

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -26,6 +26,7 @@
 import net.sf.jsqlparser.statement.merge.Merge;
 import net.sf.jsqlparser.statement.replace.Replace;
 import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.show.ShowTablesStatement;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.statement.upsert.Upsert;
@@ -119,10 +120,6 @@ public void visit(SetStatement set) {
 
     }
 
-    @Override
-    public void visit(ShowColumnsStatement set) {
-    }
-
     @Override
     public void visit(Merge merge) {
 
@@ -160,6 +157,14 @@ public void visit(ExplainStatement aThis) {
     public void visit(ShowStatement aThis) {
     }
 
+    @Override
+    public void visit(ShowColumnsStatement set) {
+    }
+
+    @Override
+    public void visit(ShowTablesStatement showTables) {
+    }
+
     @Override
     public void visit(DeclareStatement aThis) {
     }

src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java

@@ -0,0 +1,111 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.show;
+
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.StatementVisitor;
+
+import java.util.EnumSet;
+
+/**
+ * A {@code SHOW TABLES} statement
+ * @see <a href="https://dev.mysql.com/doc/refman/8.0/en/show-tables.html">MySQL show tables</a>
+ */
+public class ShowTablesStatement implements Statement {
+
+    private EnumSet<Modifiers> modifiers;
+    private SelectionMode selectionMode;
+    private String dbName;
+    private Expression likeExpression;
+    private Expression whereCondition;
+
+    public EnumSet<Modifiers> getModifiers() {
+        return modifiers;
+    }
+
+    public void setModifiers(EnumSet<Modifiers> modifiers) {
+        this.modifiers = modifiers;
+    }
+
+    public SelectionMode getSelectionMode() {
+        return selectionMode;
+    }
+
+    public void setSelectionMode(SelectionMode selectionMode) {
+        this.selectionMode = selectionMode;
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public void setDbName(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public Expression getLikeExpression() {
+        return likeExpression;
+    }
+
+    public void setLikeExpression(Expression likeExpression) {
+        this.likeExpression = likeExpression;
+    }
+
+    public Expression getWhereCondition() {
+        return whereCondition;
+    }
+
+    public void setWhereCondition(Expression whereCondition) {
+        this.whereCondition = whereCondition;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SHOW");
+
+        if (modifiers.contains(Modifiers.EXTENDED)) {
+            builder.append(" EXTENDED");
+        }
+        if (modifiers.contains(Modifiers.FULL)) {
+            builder.append(" FULL");
+        }
+
+        builder.append(" TABLES");
+
+        if (dbName != null) {
+            builder.append(" ").append(selectionMode.name()).append(" ").append(dbName);
+        }
+
+        if (likeExpression != null) {
+            builder.append(" ").append("LIKE").append(" ").append(likeExpression);
+        }
+
+        if (whereCondition != null) {
+            builder.append(" ").append("WHERE").append(" ").append(whereCondition);
+        }
+
+        return builder.toString();
+    }
+
+    @Override
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this);
+    }
+
+    public enum SelectionMode {
+        FROM, IN
+    }
+
+    public enum Modifiers {
+        EXTENDED, FULL
+    }
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -92,6 +92,7 @@
 import net.sf.jsqlparser.statement.select.TableFunction;
 import net.sf.jsqlparser.statement.select.ValuesList;
 import net.sf.jsqlparser.statement.select.WithItem;
+import net.sf.jsqlparser.statement.show.ShowTablesStatement;
 import net.sf.jsqlparser.statement.truncate.Truncate;
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.statement.upsert.Upsert;
@@ -268,7 +269,13 @@ public void visit(InExpression inExpression) {
         } else if (inExpression.getLeftItemsList() != null) {
             inExpression.getLeftItemsList().accept(this);
         }
-        inExpression.getRightItemsList().accept(this);
+        if (inExpression.getRightExpression() != null) {
+            inExpression.getRightExpression().accept(this);
+        } else if (inExpression.getRightItemsList() != null) {
+            inExpression.getRightItemsList().accept(this);
+        } else {
+            inExpression.getMultiExpressionList().accept(this);
+        }
     }
 
     @Override
@@ -879,4 +886,9 @@ public void visit(AlterSequence alterSequence) {
     public void visit(CreateFunctionalStatement createFunctionalStatement) {
         throw new UnsupportedOperationException("Finding tables from CreateFunctionalStatement is not supported");
     }
+
+    @Override
+    public void visit(ShowTablesStatement showTables) {
+        throw new UnsupportedOperationException("Finding tables from ShowTablesStatement is not supported");
+    }
 }

src/main/java/net/sf/jsqlparser/util/deparser/AbstractDeParser.java

@@ -11,6 +11,7 @@
 
 /**
  * A base for a Statement DeParser
+ *
  * @param <S> the type of statement this DeParser supports
  */
 abstract class AbstractDeParser<S> {
@@ -20,8 +21,17 @@ protected AbstractDeParser(StringBuilder buffer) {
         this.buffer = buffer;
     }
 
+    public StringBuilder getBuffer() {
+        return buffer;
+    }
+
+    public void setBuffer(StringBuilder buffer) {
+        this.buffer = buffer;
+    }
+
     /**
      * DeParses the given statement into the buffer
+     *
      * @param statement the statement to deparse
      */
     abstract void deParse(S statement);

src/main/java/net/sf/jsqlparser/util/deparser/AlterDeParser.java

@@ -11,23 +11,15 @@
 
 import net.sf.jsqlparser.statement.alter.Alter;
 
-public class AlterDeParser {
-
-    protected StringBuilder buffer;
+public class AlterDeParser extends AbstractDeParser<Alter> {
 
     public AlterDeParser(StringBuilder buffer) {
-        this.buffer = buffer;
+        super(buffer);
     }
 
+    @Override
     public void deParse(Alter alter) {
         buffer.append(alter.toString());
     }
 
-    public StringBuilder getBuffer() {
-        return buffer;
-    }
-
-    public void setBuffer(StringBuilder buffer) {
-        this.buffer = buffer;
-    }
 }