Merge branch 'master' of github.com:JSQLParser/JSqlParser

Author: manticore-projects

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()
         )

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);