Merge master into introducing-template-modern

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

@@ -246,6 +246,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_RECURSIVE:"RECURSIVE">
 |   <K_REFERENCES:"REFERENCES">
 |   <K_REGEXP: "REGEXP">
+|   <K_RLIKE: "RLIKE">
 |   <K_REPLACE:"REPLACE">
 |   <K_RESTRICT: "RESTRICT">
 |   <K_RETURNING: "RETURNING"> 
@@ -2000,6 +2001,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).useRLike(); }
     | "~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
     | "!~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASESENSITIVE); }
     | "!~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASEINSENSITIVE); }
@@ -3464,7 +3466,7 @@ AlterExpression AlterExpression():
             alterExp.setOperation(AlterOperation.DROP);
         }
          (
-             (  <K_COLUMN>
+             (  (LOOKAHEAD(2) <K_COLUMN>)?
                 (tk=<S_IDENTIFIER>    | tk=<S_QUOTED_IDENTIFIER>)
                      {
                             alterExp.setColumnName(tk.image);

src/test/java/net/sf/jsqlparser/test/alter/AlterTest.java

@@ -244,4 +244,12 @@ public void testAlterTableAddColumnKeywordTypes() throws JSQLParserException {
     public void testDropColumnRestrictIssue510() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE TABLE1 DROP COLUMN NewColumn CASCADE");
     }
+    
+    public void testDropColumnRestrictIssue551() throws JSQLParserException {
+        Statement stmt = CCJSqlParserUtil.parse("ALTER TABLE table1 DROP NewColumn");
+        
+        // COLUMN keyword appears in deparsed statement, drop becomes all caps
+        assertStatementCanBeDeparsedAs(stmt, "ALTER TABLE table1 DROP COLUMN NewColumn");
+        
+    }
 }

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

@@ -1991,6 +1991,10 @@ 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 {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE first_name RLIKE '^Ste(v|ph)en$'");
+    }
 
     public void testBooleanFunction1() throws JSQLParserException {
         String stmt = "SELECT * FROM mytable WHERE test_func(col1)";