made some modifications to rlike fix

Author: wumpz

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

@@ -27,6 +27,7 @@
 public class RegExpMySQLOperator extends BinaryExpression {
 
     private RegExpMatchOperatorType operatorType;
+    private boolean useRLike = false;
 
     public RegExpMySQLOperator(RegExpMatchOperatorType operatorType) {
         if (operatorType == null) {
@@ -39,20 +40,23 @@ public RegExpMatchOperatorType getOperatorType() {
         return operatorType;
     }
 
+    public boolean isUseRLike() {
+        return useRLike;
+    }
+
+    public RegExpMySQLOperator useRLike() {
+        useRLike = true;
+        return this;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
     @Override
     public String getStringExpression() {
-        switch (operatorType) {
-            case MATCH_CASESENSITIVE:
-                return "REGEXP BINARY";
-            case MATCH_CASEINSENSITIVE:
-                return "REGEXP";
-            default:
-        }
-        return null;
+        return (useRLike ? "RLIKE" : "REGEXP")
+                + (operatorType == RegExpMatchOperatorType.MATCH_CASESENSITIVE ? " BINARY" : "");
     }
 }

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

@@ -1998,7 +1998,7 @@ Expression RegularCondition() #RegularCondition:
     | "@@" { result = new Matches(); }
     | "~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASESENSITIVE); }
     | <K_REGEXP> [ <K_BINARY> { binary=true; } ] { result = new RegExpMySQLOperator(binary?RegExpMatchOperatorType.MATCH_CASESENSITIVE:RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
-    | <K_RLIKE> [ <K_BINARY> { binary=true; } ] { result = new RegExpMySQLOperator(binary?RegExpMatchOperatorType.MATCH_CASESENSITIVE:RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
+    | <K_RLIKE> [ <K_BINARY> { binary=true; } ] { result = new RegExpMySQLOperator(binary?RegExpMatchOperatorType.MATCH_CASESENSITIVE:RegExpMatchOperatorType.MATCH_CASEINSENSITIVE).useRLike(); }
     | "~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
     | "!~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASESENSITIVE); }
     | "!~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASEINSENSITIVE); }

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

@@ -1991,11 +1991,9 @@ public void testRegexpBinaryMySQL() throws JSQLParserException {
         String stmt = "SELECT * FROM mytable WHERE first_name REGEXP BINARY '^Ste(v|ph)en$'";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
-
+    
     public void testRlike() throws JSQLParserException {
-        String stmt = "SELECT * FROM mytable WHERE first_name RLIKE '^Ste(v|ph)en$'";
-        Statement st = CCJSqlParserUtil.parse(stmt);
-        assertStatementCanBeDeparsedAs(st, "SELECT * FROM mytable WHERE first_name REGEXP '^Ste(v|ph)en$'");
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE first_name RLIKE '^Ste(v|ph)en$'");
     }
 
     public void testBooleanFunction1() throws JSQLParserException {