Author: wumpz

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

@@ -9,13 +9,15 @@
  */
 package net.sf.jsqlparser.expression;
 
+import java.util.Objects;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 public class IntervalExpression extends ASTNodeAccessImpl implements Expression {
 
     private String parameter = null;
     private String intervalType = null;
     private final boolean intervalKeyword;
+    private Expression expression = null;
 
     public IntervalExpression() {
         this(true);
@@ -41,9 +43,19 @@ public void setIntervalType(String intervalType) {
         this.intervalType = intervalType;
     }
 
+    public Expression getExpression() {
+        return expression;
+    }
+
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
     @Override
     public String toString() {
-        return (intervalKeyword ? "INTERVAL " : "") + parameter + (intervalType != null ? " " + intervalType : "");
+        return (intervalKeyword ? "INTERVAL " : "")
+                + Objects.toString(expression, parameter)
+                + (intervalType != null ? " " + intervalType : "");
     }
 
     @Override

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

@@ -2665,6 +2665,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     ColDataType type = null;
     boolean not = false;
     boolean exclamationMarkNot = false;
+    boolean dateExpressionAllowed = true;
 }
 {
     [ <K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; } ]
@@ -2694,7 +2695,7 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(Function()) retval=Function()
 
-        | LOOKAHEAD(2) retval = IntervalExpression()
+        | LOOKAHEAD(2) retval = IntervalExpression() { dateExpressionAllowed = false; }
 
         | token=<S_DOUBLE>  { retval = new DoubleValue(token.image); }
 
@@ -2730,6 +2731,10 @@ Expression PrimaryExpression() #PrimaryExpression:
         <K_COLLATE> token=<S_IDENTIFIER> { retval = new CollateExpression(retval, token.image); } 
     ]
 
+    [
+        LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval)
+    ]
+
     ( "::" type=ColDataType() {
         castExpr = new CastExpression();
         castExpr.setUseCastKeyword(false);
@@ -2830,17 +2835,26 @@ IntervalExpression IntervalExpression() : {
     boolean signed = false;
 }
 {
-    (
-        { interval = new IntervalExpression(); }
-        <K_INTERVAL> ["-" {signed=true;}] (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> ) 
-        { interval.setParameter((signed?"-":"") + token.image); }
-        [ LOOKAHEAD(2) (token = <S_IDENTIFIER> | token = <K_DATE_LITERAL>) { interval.setIntervalType(token.image); } ]
-    |
-        { interval = new IntervalExpression(false); }
-        ( token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> | token = <S_IDENTIFIER>)
-        { interval.setParameter((signed?"-":"") + token.image); }
-        token = <K_DATE_LITERAL> { interval.setIntervalType(token.image); }
-    )
+    { interval = new IntervalExpression(); }
+    <K_INTERVAL> ["-" {signed=true;}] (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> ) 
+    { interval.setParameter((signed?"-":"") + token.image); }
+    [ LOOKAHEAD(2) (token = <S_IDENTIFIER> | token = <K_DATE_LITERAL>) { interval.setIntervalType(token.image); } ]
+    {
+        return interval;
+    }
+}
+
+IntervalExpression IntervalExpressionWithoutInterval(Expression expr) : {
+    IntervalExpression interval;
+    Token token;
+    boolean signed = false;
+}
+{
+    { 
+        interval = new IntervalExpression(false);
+        interval.setExpression(expr);
+    }
+    token = <K_DATE_LITERAL> { interval.setIntervalType(token.image); }
     {
         return interval;
     }

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

@@ -3503,6 +3503,68 @@ public void testIssue699() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(sql);
     }
 
+    @Test
+    public void testDateArithmentic9() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CURRENT_DATE + (RAND() * 12 MONTH) AS new_date FROM mytable");
+    }
+
+    @Test
+    public void testDateArithmentic10() throws JSQLParserException {
+        String sql = "select CURRENT_DATE + CASE WHEN CAST(RAND() * 3 AS INTEGER) = 1 THEN 100 ELSE 0 END DAY AS NEW_DATE from mytable";
+        assertSqlCanBeParsedAndDeparsed(sql, true);
+        Select select = (Select) CCJSqlParserUtil.parse(sql);
+
+    }
+
+    @Test
+    public void testDateArithmentic11() throws JSQLParserException {
+        String sql = "select CURRENT_DATE + (dayofweek(MY_DUE_DATE) + 5) DAY FROM mytable";
+        assertSqlCanBeParsedAndDeparsed(sql, true);
+        Select select = (Select) CCJSqlParserUtil.parse(sql);
+        final List<SelectItem> list = new ArrayList<>();
+        select.getSelectBody().accept(new SelectVisitorAdapter() {
+            @Override
+            public void visit(PlainSelect plainSelect) {
+                list.addAll(plainSelect.getSelectItems());
+            }
+        });
+
+        assertEquals(1, list.size());
+        assertTrue(list.get(0) instanceof SelectExpressionItem);
+        SelectExpressionItem item = (SelectExpressionItem) list.get(0);
+        assertTrue(item.getExpression() instanceof Addition);
+        Addition add = (Addition) item.getExpression();
+
+        assertTrue(add.getRightExpression() instanceof IntervalExpression);
+    }
+
+    @Test
+    public void testDateArithmentic12() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("select CASE WHEN CAST(RAND() * 3 AS INTEGER) = 1 THEN NULL ELSE CURRENT_DATE + (month_offset MONTH) END FROM mytable", true);
+    }
+
+    @Test
+    public void testDateArithmentic13() throws JSQLParserException {
+        String sql = "SELECT INTERVAL 5 MONTH MONTH FROM mytable";
+        assertSqlCanBeParsedAndDeparsed(sql);
+        Select select = (Select) CCJSqlParserUtil.parse(sql);
+        final List<SelectItem> list = new ArrayList<>();
+        select.getSelectBody().accept(new SelectVisitorAdapter() {
+            @Override
+            public void visit(PlainSelect plainSelect) {
+                list.addAll(plainSelect.getSelectItems());
+            }
+        });
+
+        assertEquals(1, list.size());
+        assertTrue(list.get(0) instanceof SelectExpressionItem);
+        SelectExpressionItem item = (SelectExpressionItem) list.get(0);
+        assertTrue(item.getExpression() instanceof IntervalExpression);
+        IntervalExpression interval = (IntervalExpression) item.getExpression();
+        assertEquals("INTERVAL 5 MONTH", interval.toString());
+        assertEquals("MONTH", item.getAlias().getName());
+    }
+
     @Test
     public void testRawStringExpressionIssue656() throws JSQLParserException {
         for (String c : new String[]{"u", "e", "n", "r", "b", "rb"}) {