Merge origin/master

Author: wumpz

README.md

@@ -60,6 +60,8 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.1
 
+* support for **similar to** statement
+* support for **show** statment (API - change)
 * introduces Statement streaming support by **CCJSqlParserUtil.streamStatements**
 * improved nested bracket parsing performance by a large scale
 

pom.xml

@@ -110,7 +110,7 @@
                     <dependency>
                         <groupId>net.java.dev.javacc</groupId>
                         <artifactId>javacc</artifactId>
-                        <version>7.0.3</version>
+                        <version>7.0.4</version>
                     </dependency>
                 </dependencies>
             </plugin>

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

@@ -37,6 +37,7 @@
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
+import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
@@ -172,4 +173,6 @@ public interface ExpressionVisitor {
 
     public void visit(CollateExpression aThis);
 
+    public void visit(SimilarToExpression aThis);
+
 }

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

@@ -501,4 +501,9 @@ public void visit(NextValExpression nextVal) {
     public void visit(CollateExpression col) {
         col.getLeftExpression().accept(this);
     }
+
+    @Override
+    public void visit(SimilarToExpression expr) {
+        visitBinaryExpression(expr);
+    }
 }

src/main/java/net/sf/jsqlparser/expression/operators/relational/SimilarToExpression.java

@@ -0,0 +1,55 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.relational;
+
+import net.sf.jsqlparser.expression.BinaryExpression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+
+public class SimilarToExpression extends BinaryExpression {
+
+    private boolean not = false;
+    private String escape = null;
+
+    public boolean isNot() {
+        return not;
+    }
+
+    public void setNot(boolean b) {
+        not = b;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String getStringExpression() {
+        return "SIMILAR TO";
+    }
+
+    @Override
+    public String toString() {
+        String retval = getLeftExpression() + " " + (not ? "NOT " : "") + getStringExpression() + " " + getRightExpression();
+        if (escape != null) {
+            retval += " ESCAPE " + "'" + escape + "'";
+        }
+
+        return retval;
+    }
+
+    public String getEscape() {
+        return escape;
+    }
+
+    public void setEscape(String escape) {
+        this.escape = escape;
+    }
+}

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

@@ -0,0 +1,37 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement;
+
+public class ShowColumnsStatement implements Statement {
+
+    private String tableName;
+
+    public ShowColumnsStatement(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    @Override
+    public String toString() {
+        return "SHOW COLUMNS FROM " + tableName;
+    }
+
+    @Override
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this);
+    }
+}

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

@@ -11,23 +11,23 @@
 
 public class ShowStatement implements Statement {
 
-    private String tableName;
+    private String name;
 
-    public ShowStatement(String tableName) {
-        this.tableName = tableName;
+    public ShowStatement(String name) {
+        this.name = name;
     }
 
-    public String getTableName() {
-        return tableName;
+    public String getName() {
+        return name;
     }
 
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     @Override
     public String toString() {
-        return "SHOW COLUMNS FROM " + tableName;
+        return "SHOW " + name;
     }
 
     @Override

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

@@ -61,7 +61,7 @@ public interface StatementVisitor {
 
     void visit(SetStatement set);
 
-    void visit(ShowStatement set);
+    void visit(ShowColumnsStatement set);
 
     void visit(Merge merge);
 
@@ -78,4 +78,6 @@ public interface StatementVisitor {
     void visit(DescribeStatement describe);
 
     public void visit(ExplainStatement aThis);
+
+    public void visit(ShowStatement aThis);
 }

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

@@ -112,7 +112,7 @@ public void visit(SetStatement set) {
     }
 
     @Override
-    public void visit(ShowStatement set) {
+    public void visit(ShowColumnsStatement set) {
     }
 
     @Override
@@ -147,4 +147,8 @@ public void visit(DescribeStatement describe) {
     @Override
     public void visit(ExplainStatement aThis) {
     }
+
+    @Override
+    public void visit(ShowStatement aThis) {
+    }
 }

src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java

@@ -57,6 +57,11 @@ public String toString() {
         buffer.append(" ON ");
         buffer.append(table.getFullyQualifiedName());
 
+        if (index.getUsing() != null){
+            buffer.append(" USING ");
+            buffer.append(index.getUsing());
+        }
+
         if (index.getColumnsNames() != null) {
             buffer.append(" (");