Allow BETWEEN operator to be followed by AND operator

Fixes a long-standing bug which resulted in ambiguous grammar.

The solution involves adding multiple new parser rules
which exclude the AND/OR/XOR operators from expressions
inside the BETWEEN-expression.

This solution is far from elegant. Really it's plain ugly,
but at least it gets the bug fixed. I think there's no good
way to fix it in the current parser/formatter architecture.

Fixes #534

Author: nene

src/parser/grammar.ne

@@ -154,6 +154,10 @@ expression_chain -> expression _expression_with_comments:* {%
   ([expr, chain]) => [expr, ...chain]
 %}
 
+andless_expression_chain -> andless_expression _andless_expression_with_comments:* {%
+  ([expr, chain]) => [expr, ...chain]
+%}
+
 expression_with_comments_ -> expression _ {%
   ([expr, _]) => addComments(expr, { trailing: _ })
 %}
@@ -162,18 +166,25 @@ _expression_with_comments -> _ expression {%
   ([_, expr]) => addComments(expr, { leading: _ })
 %}
 
+_andless_expression_with_comments -> _ andless_expression {%
+  ([_, expr]) => addComments(expr, { leading: _ })
+%}
+
 free_form_sql -> ( asteriskless_free_form_sql | asterisk ) {% unwrap %}
 
 asteriskless_free_form_sql ->
-  ( asteriskless_expression
+  ( asteriskless_andless_expression
+  | logic_operator
   | between_predicate
   | comma
   | comment
   | other_keyword ) {% unwrap %}
 
-expression -> ( asteriskless_expression | asterisk ) {% unwrap %}
+expression -> ( andless_expression | logic_operator ) {% unwrap %}
+
+andless_expression -> ( asteriskless_andless_expression | asterisk ) {% unwrap %}
 
-asteriskless_expression ->
+asteriskless_andless_expression ->
   ( array_subscript
   | case_expression
   | function_call
@@ -251,7 +262,7 @@ property_access -> expression _ %DOT _ (identifier | array_subscript | all_colum
   }
 %}
 
-between_predicate -> %BETWEEN _ expression_chain _ %AND _ expression {%
+between_predicate -> %BETWEEN _ andless_expression_chain _ %AND _ andless_expression {%
   ([betweenToken, _1, expr1, _2, andToken, _3, expr2]) => ({
     type: NodeType.between_predicate,
     betweenKw: toKeywordNode(betweenToken),
@@ -312,8 +323,12 @@ literal ->
 keyword ->
   ( %RESERVED_KEYWORD
   | %RESERVED_PHRASE
-  | %RESERVED_JOIN
-  | %AND
+  | %RESERVED_JOIN ) {%
+  ([[token]]) => toKeywordNode(token)
+%}
+
+logic_operator ->
+  ( %AND
   | %OR
   | %XOR ) {%
   ([[token]]) => toKeywordNode(token)

test/features/between.ts

@@ -29,4 +29,13 @@ export default function supportsBetween(format: FormatFn) {
       END AND 3
     `);
   });
+
+  // Regression test for #534
+  it('supports AND after BETWEEN', () => {
+    expect(format('SELECT foo BETWEEN 1 AND 2 AND x > 10')).toBe(dedent`
+      SELECT
+        foo BETWEEN 1 AND 2
+        AND x > 10
+    `);
+  });
 }