Cleanup from review feedback, WIP

Author: mattbasta

src/languages/clickhouse/clickhouse.formatter.ts

@@ -285,13 +285,13 @@ export const clickhouse: DialectOptions = {
 
 /**
  * Converts IN and ANY from RESERVED_FUNCTION_NAME to RESERVED_KEYWORD
- * when they are used as operators (not function calls).
+ * 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 operator: foo = ANY (1, 2, 3) - ANY comes after an operator like =
- * ANY function: ANY(foo, 1, 2, 3) - ANY 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
  */
 function postProcess(tokens: Token[]): Token[] {
   return tokens.map((token, i) => {

src/languages/clickhouse/clickhouse.keywords.ts

@@ -1,7 +1,5 @@
 export const keywords: string[] = [
   // Derived from https://github.com/ClickHouse/ClickHouse/blob/827a7ef9f6d727ef511fea7785a1243541509efb/tests/fuzz/dictionaries/keywords.dict#L4
-  // Clickhouse keywords can span multiple individual words (e.g., "ADD COLUMN"). See
-  // `keywordPhrases` below for all of these.
   'ACCESS',
   'ACTION',
   'ADD',

test/clickhouse.test.ts

@@ -62,8 +62,8 @@ describe('ClickhouseFormatter', () => {
   supportsInsertInto(format);
   supportsUpdate(format);
   supportsTruncateTable(format);
-  supportsStrings(format, ["''-qq-bs"]);
-  supportsIdentifiers(format, ['""-qq-bs', '``']);
+  supportsStrings(format, ["''-qq", "''-bs"]);
+  supportsIdentifiers(format, ['""-qq', '""-bs', '``']);
   supportsArrayLiterals(format, { withoutArrayPrefix: true });
   supportsBetween(format);
   supportsJoin(format, {

test/features/identifiers.ts

@@ -5,7 +5,6 @@ import { FormatFn } from '../../src/sqlFormatter.js';
 type IdentType =
   | '""-qq' // with repeated-quote escaping
   | '""-bs' // with backslash escaping
-  | '""-qq-bs' // with repeated-quote and backslash escaping
   | '``' // with repeated-quote escaping
   | '[]' // with ]] escaping
   | 'U&""'; // with repeated-quote escaping
@@ -44,8 +43,8 @@ export default function supportsIdentifiers(format: FormatFn, identifierTypes: I
   }
 
   if (identifierTypes.includes('""-bs')) {
-    it('supports escaping double-quote by escaping it with a backslash', () => {
-      expect(format('"foo\\"bar"')).toBe('"foo\\"bar"');
+    it('supports backslash-escaped double-quoted identifiers', () => {
+      expect(format('"foo \\" JOIN bar"')).toBe('"foo \\" JOIN bar"');
     });
 
     if (!identifierTypes.includes('""-qq')) {
@@ -55,12 +54,6 @@ export default function supportsIdentifiers(format: FormatFn, identifierTypes: I
     }
   }
 
-  if (identifierTypes.includes('""-qq-bs')) {
-    it('supports escaping double-quote with a backslash and a repeated quote', () => {
-      expect(format('"foo \\" JOIN ""bar"')).toBe('"foo \\" JOIN ""bar"');
-    });
-  }
-
   if (identifierTypes.includes('``')) {
     it('supports backtick-quoted identifiers', () => {
       expect(format('`foo JOIN bar`')).toBe('`foo JOIN bar`');

test/features/strings.ts

@@ -10,7 +10,6 @@ type StringType =
   // Note: ''-qq and ''-bs can be combined to allow for both types of escaping
   | "''-qq" // with repeated-quote escaping
   | "''-bs" // with backslash escaping
-  | "''-qq-bs" // with repeated-quote and backslash escaping
   | "U&''" // with repeated-quote escaping
   | "N''" // with escaping style depending on whether also ''-qq or ''-bs was specified
   | "X''" // no escaping
@@ -95,7 +94,7 @@ export default function supportsStrings(format: FormatFn, stringTypes: StringTyp
     }
   }
 
-  if (stringTypes.includes("''-qq-bs")) {
+  if (stringTypes.includes("''-qq") && stringTypes.includes("''-bs")) {
     it('supports escaping single-quote with a backslash and a repeated quote', () => {
       expect(format("'foo \\' JOIN ''bar'")).toBe("'foo \\' JOIN ''bar'");
     });