Skip to content

Commit b9453f2

Browse files
fix: issue #1948 Between with expression
fixes #1948 Signed-off-by: Andreas Reichel <[email protected]>
1 parent 94fb872 commit b9453f2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -3666,8 +3666,6 @@ Expression Between(Expression leftExpression) :
36663666
(
36673667
LOOKAHEAD( 3 ) betweenExpressionStart = ParenthesedSelect()
36683668
|
3669-
LOOKAHEAD( SimpleFunction() ) betweenExpressionStart = SimpleFunction()
3670-
|
36713669
LOOKAHEAD( RegularCondition() ) betweenExpressionStart = RegularCondition()
36723670
|
36733671
betweenExpressionStart = SimpleExpression()
@@ -3677,8 +3675,6 @@ Expression Between(Expression leftExpression) :
36773675
(
36783676
LOOKAHEAD( 3 ) betweenExpressionEnd = ParenthesedSelect()
36793677
|
3680-
LOOKAHEAD( SimpleFunction() ) betweenExpressionEnd = SimpleFunction()
3681-
|
36823678
LOOKAHEAD( RegularCondition() ) betweenExpressionEnd = RegularCondition()
36833679
|
36843680
betweenExpressionEnd = SimpleExpression()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.sf.jsqlparser.expression.operators.relational;
2+
3+
import net.sf.jsqlparser.JSQLParserException;
4+
import net.sf.jsqlparser.test.TestUtils;
5+
import org.junit.jupiter.api.Test;
6+
7+
import static org.junit.jupiter.api.Assertions.*;
8+
9+
class BetweenTest {
10+
@Test
11+
void testBetweenWithAdditionIssue1948() throws JSQLParserException {
12+
String sqlStr = "select col FROM tbl WHERE start_time BETWEEN 1706024185 AND MyFunc() - 734400";
13+
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
14+
}
15+
}

0 commit comments

Comments
 (0)