Merge origin/master

Author: wumpz

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

@@ -3102,7 +3102,7 @@ IntervalExpression IntervalExpression() : {
 {
 
 { interval = new IntervalExpression(); }
-    <K_INTERVAL> ["-" {signed=true;}] (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> | expr = Column()) 
+    <K_INTERVAL> ["-" {signed=true;}] (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> | expr = Column())
     { 
         if (expr != null) {
             if (signed) expr = new SignedExpression('-', expr);
@@ -3308,7 +3308,7 @@ WhenClause WhenThenSearchCondition():
 }
 {
     <K_WHEN> (LOOKAHEAD(Expression()) whenExp=Expression() | whenExp=SimpleExpression()) 
-        <K_THEN> thenExp=Condition()
+        <K_THEN> thenExp=Expression()
     {
        whenThen.setWhenExpression(whenExp);
        whenThen.setThenExpression(thenExp);

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

@@ -1322,6 +1322,12 @@ public void testIssue862CaseWhenConcat() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT c1, CASE c1 || c2 WHEN '091' THEN '2' ELSE '1' END AS c11 FROM T2");
     }
 
+    @Test
+    @Ignore
+    public void testExpressionsInIntervalExpression() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT DATE_SUB(mydate, INTERVAL DAY(anotherdate) - 1 DAY) FROM tbl");
+    }
+
     @Test
     public void testReplaceAsFunction() throws JSQLParserException {
         String statement = "SELECT REPLACE(a, 'b', c) FROM tab1";
@@ -3976,4 +3982,18 @@ public void testWrongParseTreeIssue89() throws JSQLParserException {
                 .extracting(item -> item.toString())
                 .contains("col");
     }
+
+    @Test
+    public void testCaseWithComplexWhenExpression() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT av.app_id, MAX(av.version_no) AS version_no\n"
+                + "FROM app_version av\n"
+                + "JOIN app_version_policy avp ON av.id = avp.app_version_id\n"
+                + "WHERE av.`status` = 1\n"
+                + "AND CASE \n"
+                + "WHEN avp.area IS NOT NULL\n"
+                + "AND length(avp.area) > 0 THEN avp.area LIKE CONCAT('%,', '12', ',%')\n"
+                + "OR avp.area LIKE CONCAT('%,', '13', ',%')\n"
+                + "ELSE 1 = 1\n"
+                + "END\n", true);
+    }
 }