Merge origin/master

Author: wumpz

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

@@ -3018,13 +3018,20 @@ JsonExpression JsonExpression() : {
 
 IntervalExpression IntervalExpression() : {
     IntervalExpression interval;
+    Column col;
     Token token;
     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); }
+    <K_INTERVAL> ["-" {signed=true;}]
+    (
+        ((token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> )
+        { interval.setParameter((signed?"-":"") + token.image); })
+        |
+        (col=Column()
+        { interval.setExpression(col); })
+    )
     [ LOOKAHEAD(2) (token = <S_IDENTIFIER> | token = <K_DATE_LITERAL>) { interval.setIntervalType(token.image); } ]
     {
         return interval;

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

@@ -2182,6 +2182,12 @@ public void testValues6BothVariants() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    public void testIntervalWithColumn() throws JSQLParserException {
+        String stmt = "SELECT DATE_ADD(start_date, INTERVAL duration MINUTE) AS end_datetime FROM appointment";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testInterval1() throws JSQLParserException {
         String stmt = "SELECT 5 + INTERVAL '3 days'";