fix: issue #1948 Between with expression

fixes #1948 Signed-off-by: Andreas Reichel <[email protected]>
JSQLParser · Feb 23, 2024 · b9453f2 · b9453f2
1 parent 94fb872
commit b9453f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -3666,8 +3666,6 @@ Expression Between(Expression leftExpression) :
         (
             LOOKAHEAD( 3 ) betweenExpressionStart = ParenthesedSelect()
             |
-            LOOKAHEAD( SimpleFunction() ) betweenExpressionStart = SimpleFunction()
-            |
             LOOKAHEAD( RegularCondition() ) betweenExpressionStart = RegularCondition()
             |
             betweenExpressionStart  = SimpleExpression()
@@ -3677,8 +3675,6 @@ Expression Between(Expression leftExpression) :
         (
             LOOKAHEAD( 3 ) betweenExpressionEnd = ParenthesedSelect()
             |
-            LOOKAHEAD( SimpleFunction() ) betweenExpressionEnd = SimpleFunction()
-            |
             LOOKAHEAD( RegularCondition() ) betweenExpressionEnd = RegularCondition()
             |
             betweenExpressionEnd = SimpleExpression()

diff --git a/src/test/java/net/sf/jsqlparser/expression/operators/relational/BetweenTest.java b/src/test/java/net/sf/jsqlparser/expression/operators/relational/BetweenTest.java
@@ -0,0 +1,15 @@
+package net.sf.jsqlparser.expression.operators.relational;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class BetweenTest {
+    @Test
+    void testBetweenWithAdditionIssue1948() throws JSQLParserException {
+        String sqlStr = "select col FROM tbl WHERE start_time BETWEEN 1706024185 AND MyFunc() - 734400";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+}