Changes from feedback

Author: mattbasta

src/languages/clickhouse/clickhouse.formatter.ts

@@ -258,7 +258,7 @@ export const clickhouse: DialectOptions = {
       // https://clickhouse.com/docs/sql-reference/syntax#defining-and-using-query-parameters
       custom: [
         {
-          regex: String.raw`\{\s*[^:]+:[^}]+\}`,
+          regex: String.raw`\{[^:]+:[^}]+\}`,
           key: v => {
             const match = /\{([^:]+):/.exec(v);
             return match ? match[1].trim() : v;
@@ -267,13 +267,18 @@ export const clickhouse: DialectOptions = {
       ],
     },
     operators: [
-      // Arithmetic
+      // Strings, arithmetic
       '%', // modulo
+      '||', // string concatenation
 
       // Ternary
       '?',
       ':',
 
+      // Comparison
+      '==',
+      '<=>', // null-safe equal
+
       // Lambda creation
       '->',
     ],
@@ -286,14 +291,10 @@ export const clickhouse: DialectOptions = {
 };
 
 /**
- * Converts IN and ANY from RESERVED_FUNCTION_NAME to RESERVED_KEYWORD
- * when they are used as operators/modifiers (not function calls).
- *
- * IN operator: foo IN (1, 2, 3) - IN comes after an identifier/expression
- * IN function: IN(foo, 1, 2, 3) - IN comes at start or after operators/keywords
- *
- * ANY join modifier: ANY LEFT JOIN, ANY JOIN - ANY comes after an operator
- * any() aggregate function: any(column) - selects first encountered value
+ * 1. Formats GRANT statements to use RESERVED_KEYWORD instead of RESERVED_SELECT
+ *    for SELECT GRANTs
+ * 2. Formats SET(100) as RESERVED_FUNCTION_NAME instead of RESERVED_KEYWORD
+ *    so it appears as a function rather than a statement.
  */
 function postProcess(tokens: Token[]): Token[] {
   return tokens.map((token, i) => {

src/lexer/token.ts

@@ -80,7 +80,6 @@ export const testToken =
 export const isToken = {
   ARRAY: testToken({ text: 'ARRAY', type: TokenType.RESERVED_DATA_TYPE }),
   BY: testToken({ text: 'BY', type: TokenType.RESERVED_KEYWORD }),
-  IN: testToken({ text: 'IN', type: TokenType.RESERVED_KEYWORD }),
   SET: testToken({ text: 'SET', type: TokenType.RESERVED_CLAUSE }),
   STRUCT: testToken({ text: 'STRUCT', type: TokenType.RESERVED_DATA_TYPE }),
   WINDOW: testToken({ text: 'WINDOW', type: TokenType.RESERVED_CLAUSE }),

test/clickhouse.test.ts

@@ -173,18 +173,25 @@ describe('ClickhouseFormatter', () => {
   it('supports the ternary operator', () => {
     // NOTE: Ternary operators have a missing space because
     // ExpressionFormatter's `formatOperator` method special-cases `:`.
-    expect(format('SELECT foo?bar: baz;')).toBe('SELECT\n  foo ? bar: baz;');
+    expect(format('SELECT foo?bar: baz;')).toBe(dedent`
+      SELECT
+        foo ? bar: baz;
+    `);
   });
 
   // Should support the lambda creation operator
   it('supports the lambda creation operator', () => {
-    expect(format('SELECT arrayMap(x->2*x, [1,2,3,4]) AS result;')).toBe(
-      'SELECT\n  arrayMap(x -> 2 * x, [1, 2, 3, 4]) AS result;'
-    );
+    expect(format('SELECT arrayMap(x->2*x, [1,2,3,4]) AS result;')).toBe(dedent`
+      SELECT
+        arrayMap(x -> 2 * x, [1, 2, 3, 4]) AS result;
+    `);
   });
 
   it('should support parameters', () => {
-    expect(format('SELECT {foo:Uint64};', { params: { foo: "'123'" } })).toBe("SELECT\n  '123';");
+    expect(format('SELECT {foo:Uint64};', { params: { foo: "'123'" } })).toBe(dedent`
+      SELECT
+        '123';
+    `);
     expect(format('SELECT {foo:Map(String, String)};', { params: { foo: "{'bar': 'baz'}" } })).toBe(
       dedent`
         SELECT
@@ -568,9 +575,8 @@ describe('ClickhouseFormatter', () => {
   // https://clickhouse.com/docs/sql-reference/statements/alter/order-by
   describe('ALTER ORDER BY statements', () => {
     it('formats ALTER TABLE MODIFY ORDER BY', () => {
-      expect(
-        format('ALTER TABLE db.events ON CLUSTER prod MODIFY ORDER BY (user_id, timestamp);')
-      ).toBe(dedent`
+      expect(format('ALTER TABLE db.events ON CLUSTER prod MODIFY ORDER BY (user_id, timestamp);'))
+        .toBe(dedent`
         ALTER TABLE db.events
         ON CLUSTER prod
         MODIFY ORDER BY (user_id, timestamp);
@@ -937,7 +943,8 @@ describe('ClickhouseFormatter', () => {
     });
 
     it('formats DROP SETTINGS PROFILE', () => {
-      expect(format('DROP SETTINGS PROFILE IF EXISTS profile1, profile2 ON CLUSTER my_cluster;')).toBe(dedent`
+      expect(format('DROP SETTINGS PROFILE IF EXISTS profile1, profile2 ON CLUSTER my_cluster;'))
+        .toBe(dedent`
         DROP SETTINGS PROFILE IF EXISTS
           profile1,
           profile2