Merge PR #414: Fix tabular style formatting of LIMIT clause

Author: nene

src/formatter/ExpressionFormatter.ts

@@ -170,13 +170,17 @@ export default class ExpressionFormatter {
     this.layout.add(WS.NEWLINE, WS.INDENT, this.showKw(node.name));
     this.layout.indentation.increaseTopLevel();
 
-    if (node.offset) {
+    if (isTabularStyle(this.cfg)) {
+      this.layout.add(WS.SPACE);
+    } else {
       this.layout.add(WS.NEWLINE, WS.INDENT);
+    }
+
+    if (node.offset) {
       this.layout = this.formatSubExpression(node.offset);
       this.layout.add(WS.NO_SPACE, ',', WS.SPACE);
       this.layout = this.formatSubExpression(node.count);
     } else {
-      this.layout.add(WS.NEWLINE, WS.INDENT);
       this.layout = this.formatSubExpression(node.count);
     }
     this.layout.indentation.decreaseTopLevel();

src/formatter/tabularStyle.ts

@@ -35,6 +35,7 @@ export function isTabularToken(type: TokenType): boolean {
     type === TokenType.RESERVED_COMMAND ||
     type === TokenType.RESERVED_SELECT ||
     type === TokenType.RESERVED_SET_OPERATION ||
-    type === TokenType.RESERVED_JOIN
+    type === TokenType.RESERVED_JOIN ||
+    type === TokenType.LIMIT
   );
 }

test/features/limiting.ts

@@ -49,6 +49,16 @@ export default function supportsLimiting(format: FormatFn, types: LimitingTypes)
             6;
       `);
     });
+
+    // Regression test for #412
+    it('formats LIMIT in tabular style', () => {
+      const result = format('SELECT * FROM tbl LIMIT 5, 6;', { indentStyle: 'tabularLeft' });
+      expect(result).toBe(dedent`
+        SELECT    *
+        FROM      tbl
+        LIMIT     5, 6;
+      `);
+    });
   }
 
   if (types.limit && types.offset) {