Merge PR #350: Fix BETWEEN..AND formatting in tabular style

Author: nene

src/formatter/ExpressionFormatter.ts

@@ -125,7 +125,7 @@ export default class ExpressionFormatter {
       WS.SPACE,
       this.show(node.expr1),
       WS.SPACE,
-      this.show(node.andToken),
+      this.showNonTabular(node.andToken),
       WS.SPACE,
       this.show(node.expr2),
       WS.SPACE
@@ -369,7 +369,12 @@ export default class ExpressionFormatter {
     }
   }
 
-  // don't call this directly, always use show() instead.
+  // Like show(), but skips tabular formatting
+  private showNonTabular(token: Token): string {
+    return this.showToken(token);
+  }
+
+  // don't call this directly, always use show() or showNonTabular() instead.
   private showToken(token: Token): string {
     if (isReserved(token)) {
       switch (this.cfg.keywordCase) {

test/options/indentStyle.ts

@@ -118,6 +118,17 @@ export default function supportsIndentStyle(format: FormatFn) {
         ;
       `);
     });
+
+    // Regression test for issue #341
+    it('formats BETWEEN..AND', () => {
+      expect(
+        format('SELECT * FROM tbl WHERE id BETWEEN 1 AND 5000;', { indentStyle: 'tabularLeft' })
+      ).toBe(dedent`
+        SELECT    *
+        FROM      tbl
+        WHERE     id BETWEEN 1 AND 5000;
+      `);
+    });
   });
 
   describe('indentStyle: tabularRight', () => {
@@ -165,5 +176,19 @@ export default function supportsIndentStyle(format: FormatFn) {
         ].join('\n')
       );
     });
+
+    // Regression test for issue #341
+    it('formats BETWEEN..AND', () => {
+      expect(
+        format('SELECT * FROM tbl WHERE id BETWEEN 1 AND 5000;', { indentStyle: 'tabularRight' })
+      ).toBe(
+        [
+          // ...comment to force multi-line array...
+          '   SELECT *',
+          '     FROM tbl',
+          '    WHERE id BETWEEN 1 AND 5000;',
+        ].join('\n')
+      );
+    });
   });
 }