Fix[2288] - Support parenthesed expressions within Between (#2289)

davyboyhayes · David Hayes · web-flow · commit f10b52eda68d · 2025-08-05T21:57:46.000+07:00
Supports the SQL of the form:
```sql
SELECT * FROM tbl WHERE
day BETWEEN
  CAST(CAST((NOW() + INTERVAL '-30 day') AS date) AS timestamptz)
AND
  CAST(CAST((NOW() + INTERVAL '-1 day') AS date) AS timestamptz);
```

Co-authored-by: David Hayes &lt;dhayes@adobe.com&gt;
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -5746,18 +5746,18 @@ Expression Between(Expression leftExpression) :
             )
         ]
         (
-            LOOKAHEAD( 3 ) betweenExpressionStart = ParenthesedSelect()
+            LOOKAHEAD( ParenthesedSelect() ) betweenExpressionStart = ParenthesedSelect()
             |
-            LOOKAHEAD( 11 ) betweenExpressionStart = RegularCondition()
+            LOOKAHEAD( RegularCondition() ) betweenExpressionStart = RegularCondition()
             |
             betweenExpressionStart  = SimpleExpression()
         )
 
         <K_AND>
         (
-            LOOKAHEAD( 3 ) betweenExpressionEnd = ParenthesedSelect()
+            LOOKAHEAD( ParenthesedSelect() ) betweenExpressionEnd = ParenthesedSelect()
             |
-            LOOKAHEAD( 11 ) betweenExpressionEnd = RegularCondition()
+            LOOKAHEAD( RegularCondition() ) betweenExpressionEnd = RegularCondition()
             |
             betweenExpressionEnd = SimpleExpression()
         )
diff --git a/src/test/resources/simple_parsing.txt b/src/test/resources/simple_parsing.txt
@@ -210,4 +210,10 @@ AND THIS_EMP.WORKDEPT = DINFO.DEPTNO
 
 select * from Person where deptname='it' AND NOT (age=24)
 
-select * from unnest(array[4,5,6]) with ordinality;
+select * from unnest(array[4,5,6]) with ordinality;
+
+SELECT * FROM tbl WHERE
+day BETWEEN
+  CAST(CAST((NOW() + INTERVAL '-30 day') AS date) AS timestamptz)
+AND
+  CAST(CAST((NOW() + INTERVAL '-1 day') AS date) AS timestamptz);

Original file line number	Diff line number	Diff line change
`@@ -5746,18 +5746,18 @@ Expression Between(Expression leftExpression) :`
`5746`	`5746`	`)`
`5747`	`5747`	`]`
`5748`	`5748`	`(`
`5749`		`- LOOKAHEAD( 3 ) betweenExpressionStart = ParenthesedSelect()`
	`5749`	`+ LOOKAHEAD( ParenthesedSelect() ) betweenExpressionStart = ParenthesedSelect()`
`5750`	`5750`	`\|`
`5751`		`- LOOKAHEAD( 11 ) betweenExpressionStart = RegularCondition()`
	`5751`	`+ LOOKAHEAD( RegularCondition() ) betweenExpressionStart = RegularCondition()`
`5752`	`5752`	`\|`
`5753`	`5753`	`betweenExpressionStart = SimpleExpression()`
`5754`	`5754`	`)`
`5755`	`5755`
`5756`	`5756`	`<K_AND>`
`5757`	`5757`	`(`
`5758`		`- LOOKAHEAD( 3 ) betweenExpressionEnd = ParenthesedSelect()`
	`5758`	`+ LOOKAHEAD( ParenthesedSelect() ) betweenExpressionEnd = ParenthesedSelect()`
`5759`	`5759`	`\|`
`5760`		`- LOOKAHEAD( 11 ) betweenExpressionEnd = RegularCondition()`
	`5760`	`+ LOOKAHEAD( RegularCondition() ) betweenExpressionEnd = RegularCondition()`
`5761`	`5761`	`\|`
`5762`	`5762`	`betweenExpressionEnd = SimpleExpression()`
`5763`	`5763`	`)`