fixes #789

Author: wumpz

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/util/TablesNamesFinder.java

@@ -81,6 +81,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.schema.Table;
 import net.sf.jsqlparser.statement.Block;
@@ -856,4 +857,9 @@ public void visit(CollateExpression col) {
     @Override
     public void visit(ShowStatement aThis) {
     }
+
+    @Override
+    public void visit(SimilarToExpression expr) {
+        visitBinaryExpression(expr);
+    }
 }

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

@@ -83,6 +83,7 @@
 import net.sf.jsqlparser.expression.operators.relational.OldOracleJoinBinaryExpression;
 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.expression.operators.relational.SupportsOldOracleJoinSyntax;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
@@ -346,9 +347,6 @@ public void visit(Subtraction subtraction) {
     }
 
     protected void visitBinaryExpression(BinaryExpression binaryExpression, String operator) {
-//        if (binaryExpression.isNot()) {
-//            buffer.append(NOT);
-//        }
         binaryExpression.getLeftExpression().accept(this);
         buffer.append(operator);
         binaryExpression.getRightExpression().accept(this);
@@ -797,4 +795,9 @@ public void visit(CollateExpression col) {
         buffer.append(col.getLeftExpression().toString()).append(" COLLATE ").append(col.getCollate());
     }
 
+    @Override
+    public void visit(SimilarToExpression expr) {
+        visitBinaryExpression(expr, (expr.isNot() ? " NOT" : "") + " SIMILAR TO ");
+    }
+
 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -252,6 +252,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_SETS:"SETS">
 |   <K_SHOW : "SHOW">
 |   <K_SIBLINGS:"SIBLINGS">
+|   <K_SIMILAR:"SIMILAR">
 |   <K_SKIP: "SKIP">
 |   <K_SOME:"SOME">
 |   <K_START:"START">
@@ -261,6 +262,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_TEMP:"TEMP">
 |   <K_TEMPORARY:"TEMPORARY">
 |   <K_TIME_KEY_EXPR : ( "CURRENT_TIMESTAMP" | "CURRENT_TIME" | "CURRENT_DATE" ) ( "()" )?>
+|   <K_TO:"TO">
 |   <K_TOP:"TOP">
 |   <K_TRAILING:"TRAILING">
 |   <K_TRUNCATE:"TRUNCATE">
@@ -2260,11 +2262,12 @@ Expression SQLCondition():
 }
 {
     (
-    LOOKAHEAD(InExpression()) result=InExpression()
+    result=ExistsExpression()
+    | LOOKAHEAD(InExpression()) result=InExpression()
     | LOOKAHEAD(Between()) result=Between()
     | LOOKAHEAD(IsNullExpression()) result=IsNullExpression()
-    | LOOKAHEAD(ExistsExpression()) result=ExistsExpression()
-    |  result=LikeExpression()
+    | LOOKAHEAD(3) result=LikeExpression()
+    | result=SimilarToExpression()
     )
     { return result; }
 }
@@ -2334,6 +2337,26 @@ Expression LikeExpression() #LikeExpression:
     }
 }
 
+Expression SimilarToExpression() #SimilarToExpression:
+{
+    SimilarToExpression result = new SimilarToExpression();
+    Expression leftExpression = null;
+    Expression rightExpression = null;
+}
+{
+    leftExpression=SimpleExpression()
+    [<K_NOT> { result.setNot(true); } ]
+    <K_SIMILAR> <K_TO> 
+    rightExpression=SimpleExpression()
+    [<K_ESCAPE> token=<S_CHAR_LITERAL> { result.setEscape((new StringValue(token.image)).getValue()); }]
+    {
+        result.setLeftExpression(leftExpression);
+        result.setRightExpression(rightExpression);
+        linkAST(result,jjtThis);
+        return result;
+    }
+}
+
 Expression IsNullExpression():
 {
     IsNullExpression result = new IsNullExpression();

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -3631,7 +3631,12 @@ public void testSubQueryAliasIssue754() throws JSQLParserException {
     }
 
     @Test
-    public void testSubQueryOrderByIssue705() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT a.* FROM ((SELECT T1.SACOJA FROM SOLARB t1) ORDER BY sacoja ASC) a");
+    public void testSimilarToIssue789() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE (w_id SIMILAR TO '/foo/__/bar/(left|right)/[0-9]{4}-[0-9]{2}-[0-9]{2}(/[0-9]*)?')");
+    }
+
+    @Test
+    public void testSimilarToIssue789_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE (w_id NOT SIMILAR TO '/foo/__/bar/(left|right)/[0-9]{4}-[0-9]{2}-[0-9]{2}(/[0-9]*)?')");
     }
 }