The duration part in INTERVAL expressions can contain a column and no…

…t only a constant - now supporting that use case
JSQLParser · Jul 26, 2019 · 5492f51 · 5492f51
1 parent 1314cd0
commit 5492f51
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -2955,13 +2955,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;

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -2177,6 +2177,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'";