Merge PR #317: Remove RESERVED_JOIN_CONDITION token type

nene · web-flow · commit 228991e8131f · 2022-07-15T19:52:01.000+03:00
diff --git a/src/formatter/ExpressionFormatter.ts b/src/formatter/ExpressionFormatter.ts
@@ -195,8 +195,6 @@ export default class ExpressionFormatter {
         return this.formatJoin(token);
       case TokenType.RESERVED_DEPENDENT_CLAUSE:
         return this.formatDependentClause(token);
-      case TokenType.RESERVED_JOIN_CONDITION:
-        return this.formatJoinCondition(token);
       case TokenType.RESERVED_LOGICAL_OPERATOR:
         return this.formatLogicalOperator(token);
       case TokenType.RESERVED_KEYWORD:
@@ -293,11 +291,6 @@ export default class ExpressionFormatter {
     this.layout.add(WS.NEWLINE, WS.INDENT, this.show(token), WS.SPACE);
   }
 
-  // Formats ON and USING keywords
-  private formatJoinCondition(token: Token) {
-    this.layout.add(this.show(token), WS.SPACE);
-  }
-
   /**
    * Formats an Operator onto query, following rules for specific characters
    */
diff --git a/src/languages/bigquery/bigquery.keywords.ts b/src/languages/bigquery/bigquery.keywords.ts
@@ -65,7 +65,7 @@ export const keywords = flatKeywordList({
     'NULL',
     'NULLS',
     'OF',
-    // 'ON',
+    'ON',
     // 'OR',
     // 'ORDER',
     // 'OUTER',
@@ -92,7 +92,7 @@ export const keywords = flatKeywordList({
     'UNBOUNDED',
     // 'UNION',
     'UNNEST',
-    // 'USING',
+    'USING',
     // 'WHEN',
     // 'WHERE',
     // 'WINDOW',
diff --git a/src/languages/db2/db2.keywords.ts b/src/languages/db2/db2.keywords.ts
@@ -138,8 +138,7 @@ export const keywords = flatKeywordList({
     'OBID',
     'OF',
     'OLD',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'OPTIMIZATION',
     'OPTIMIZE',
     'ORDER',
@@ -221,6 +220,7 @@ export const keywords = flatKeywordList({
     'UNIQUE',
     'UNTIL',
     'USER',
+    'USING',
     'VALIDPROC',
     'VARIABLE',
     'VARIANT',
@@ -359,4 +359,5 @@ export const keywords = flatKeywordList({
     'TERM UTILITY',
     'TRACE CT',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/hive/hive.keywords.ts b/src/languages/hive/hive.keywords.ts
@@ -260,7 +260,7 @@ export const keywords = flatKeywordList({
     'NOT',
     'NULL',
     'OF',
-    // 'ON',
+    'ON',
     // 'OR',
     'ORDER',
     'OUT',
@@ -297,6 +297,7 @@ export const keywords = flatKeywordList({
     'UNIQUEJOIN',
     // 'UPDATE',
     'USER',
+    'USING',
     'UTC_TMESTAMP',
     // 'VALUES',
     'VARCHAR',
diff --git a/src/languages/mariadb/mariadb.keywords.ts b/src/languages/mariadb/mariadb.keywords.ts
@@ -364,8 +364,7 @@ export const keywords = flatKeywordList({
     'OF',
     'OFFSET',
     'OLD_PASSWORD',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONE',
     'ONLINE',
     'ONLY',
@@ -602,6 +601,7 @@ export const keywords = flatKeywordList({
     'USER',
     'USER_RESOURCES',
     'USE_FRM',
+    'USING',
     'UTC_DATE',
     'UTC_TIME',
     'UTC_TIMESTAMP',
@@ -635,4 +635,5 @@ export const keywords = flatKeywordList({
     'YEAR_MONTH',
     'ZEROFILL',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/mysql/mysql.keywords.ts b/src/languages/mysql/mysql.keywords.ts
@@ -350,8 +350,7 @@ export const keywords = flatKeywordList({
     'OFFSET',
     'OJ',
     'OLD',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONE',
     'ONLY',
     'OPEN',
@@ -617,6 +616,7 @@ export const keywords = flatKeywordList({
     'USAGE',
     'USER_RESOURCES',
     'USE_FRM',
+    'USING',
     'VALIDATION',
     'VALUE',
     'VARBINARY',
@@ -643,4 +643,5 @@ export const keywords = flatKeywordList({
     'ZEROFILL',
     'ZONE',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/n1ql/n1ql.keywords.ts b/src/languages/n1ql/n1ql.keywords.ts
@@ -104,6 +104,7 @@ export const keywords = flatKeywordList({
     'NUMBER',
     'OBJECT',
     'OFFSET',
+    'ON',
     'OPTION',
     'OPTIONS',
     'ORDER',
@@ -159,6 +160,7 @@ export const keywords = flatKeywordList({
     'UNSET',
     'USE',
     'USER',
+    'USING',
     'VALIDATE',
     'VALUE',
     'VALUED',
diff --git a/src/languages/plsql/plsql.keywords.ts b/src/languages/plsql/plsql.keywords.ts
@@ -196,8 +196,7 @@ export const keywords = flatKeywordList({
     'OCITYPE',
     'OF',
     'OLD',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONLY',
     'OPAQUE',
     'OPEN',
@@ -330,6 +329,7 @@ export const keywords = flatKeywordList({
     'UNTRUSTED',
     'USE',
     'USER',
+    'USING',
     'VALIDATE',
     'VALIST',
     'VALUE',
@@ -350,4 +350,5 @@ export const keywords = flatKeywordList({
     'YEAR',
     'ZONE',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/postgresql/postgresql.keywords.ts b/src/languages/postgresql/postgresql.keywords.ts
@@ -372,9 +372,7 @@ export const keywords = flatKeywordList({
     'OIDS',
     'OLD',
     'OMIT',
-    'ON COMMIT',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONE',
     'ONLY',
     'OPEN',
@@ -611,6 +609,7 @@ export const keywords = flatKeywordList({
     'USER_DEFINED_TYPE_CODE',
     'USER_DEFINED_TYPE_NAME',
     'USER_DEFINED_TYPE_SCHEMA',
+    'USING',
     'UTF16',
     'UTF32',
     'UTF8',
@@ -652,4 +651,5 @@ export const keywords = flatKeywordList({
     'YES',
     'ZONE',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE', 'ON COMMIT'],
 });
diff --git a/src/languages/redshift/redshift.keywords.ts b/src/languages/redshift/redshift.keywords.ts
@@ -72,6 +72,7 @@ export const keywords = flatKeywordList({
     'OFFSET',
     'OID',
     'OLD',
+    'ON',
     'ONLY',
     'OPEN',
     'ORDER',
@@ -103,6 +104,7 @@ export const keywords = flatKeywordList({
     'TRAILING',
     'TRUE',
     'UNIQUE',
+    'USING',
     'VERBOSE',
     'WALLET',
     'WITHOUT',
diff --git a/src/languages/spark/spark.keywords.ts b/src/languages/spark/spark.keywords.ts
@@ -230,6 +230,7 @@ export const keywords = flatKeywordList({
     'UNSET',
     'USE',
     'USER',
+    'USING',
     'VIEW',
     'WINDOW',
     'YEAR',
@@ -262,8 +263,7 @@ export const keywords = flatKeywordList({
     'MINUTE_SECOND',
     'NULLIF',
     'OFFSET',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'OPTIMIZE',
     'REGEXP',
     'SEPARATOR',
@@ -275,4 +275,5 @@ export const keywords = flatKeywordList({
     'VARIABLES',
     'YEAR_MONTH',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/sql/sql.keywords.ts b/src/languages/sql/sql.keywords.ts
@@ -139,8 +139,7 @@ export const keywords = flatKeywordList({
     'NUMERIC',
     'OF',
     'OLD',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONLY',
     'OPEN',
     'ORDER',
@@ -214,6 +213,7 @@ export const keywords = flatKeywordList({
     'UNNEST',
     'UPDATE',
     'USER',
+    'USING',
     'VALUE',
     'VALUES',
     'VARBINARY',
@@ -225,4 +225,5 @@ export const keywords = flatKeywordList({
     'WITHOUT',
     'YEAR',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/sqlite/sqlite.keywords.ts b/src/languages/sqlite/sqlite.keywords.ts
@@ -101,8 +101,7 @@ export const keywords = flatKeywordList({
     'NULLS',
     'OF',
     'OFFSET',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'ONLY',
     'OPEN',
     // 'OR',
@@ -157,4 +156,5 @@ export const keywords = flatKeywordList({
     'WITH',
     'WITHOUT',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/languages/tsql/tsql.keywords.ts b/src/languages/tsql/tsql.keywords.ts
@@ -105,8 +105,7 @@ export const keywords = flatKeywordList({
     'OF',
     'OFF',
     'OFFSETS',
-    'ON DELETE',
-    'ON UPDATE',
+    'ON',
     'OPEN',
     'OPENDATASOURCE',
     'OPENQUERY',
@@ -688,4 +687,5 @@ export const keywords = flatKeywordList({
     'YEAR',
     'ZONE',
   ],
+  constraints: ['ON DELETE', 'ON UPDATE'],
 });
diff --git a/src/lexer/Tokenizer.ts b/src/lexer/Tokenizer.ts
@@ -17,8 +17,6 @@ interface TokenizerOptions {
   reservedBinaryCommands: string[];
   // Various joins like LEFT OUTER JOIN
   reservedJoins: string[];
-  // keywords used for JOIN conditions, defaults to: [ON, USING]
-  reservedJoinConditions?: string[];
   // built in function names
   reservedFunctionNames: string[];
   // all other reserved words (not included to any of the above lists)
@@ -109,10 +107,6 @@ export default class Tokenizer {
         regex: regex.reservedWord(cfg.reservedLogicalOperators ?? ['AND', 'OR'], cfg.identChars),
         value: v => v.toUpperCase(),
       },
-      [TokenType.RESERVED_JOIN_CONDITION]: {
-        regex: regex.reservedWord(cfg.reservedJoinConditions ?? ['ON', 'USING'], cfg.identChars),
-        value: v => v.toUpperCase(),
-      },
       [TokenType.NAMED_PARAMETER]: {
         regex: regex.parameter(
           cfg.namedParamTypes ?? [],
diff --git a/src/lexer/TokenizerEngine.ts b/src/lexer/TokenizerEngine.ts
@@ -110,10 +110,9 @@ export default class TokenizerEngine {
       this.matchToken(TokenType.RESERVED_BINARY_COMMAND) ||
       this.matchToken(TokenType.RESERVED_DEPENDENT_CLAUSE) ||
       this.matchToken(TokenType.RESERVED_JOIN) ||
-      this.matchToken(TokenType.RESERVED_FUNCTION_NAME) ||
-      this.matchToken(TokenType.RESERVED_KEYWORD) ||
       this.matchToken(TokenType.RESERVED_LOGICAL_OPERATOR) ||
-      this.matchToken(TokenType.RESERVED_JOIN_CONDITION)
+      this.matchToken(TokenType.RESERVED_FUNCTION_NAME) ||
+      this.matchToken(TokenType.RESERVED_KEYWORD)
     );
   }
 
diff --git a/src/lexer/token.ts b/src/lexer/token.ts
@@ -11,7 +11,6 @@ export enum TokenType {
   RESERVED_BINARY_COMMAND = 'RESERVED_BINARY_COMMAND',
   RESERVED_COMMAND = 'RESERVED_COMMAND',
   RESERVED_JOIN = 'RESERVED_JOIN',
-  RESERVED_JOIN_CONDITION = 'RESERVED_JOIN_CONDITION',
   RESERVED_CASE_START = 'RESERVED_CASE_START',
   RESERVED_CASE_END = 'RESERVED_CASE_END',
   OPERATOR = 'OPERATOR',
@@ -79,7 +78,6 @@ export const isReserved = (token: Token): boolean =>
   token.type === TokenType.RESERVED_FUNCTION_NAME ||
   token.type === TokenType.RESERVED_LOGICAL_OPERATOR ||
   token.type === TokenType.RESERVED_DEPENDENT_CLAUSE ||
-  token.type === TokenType.RESERVED_JOIN_CONDITION ||
   token.type === TokenType.RESERVED_COMMAND ||
   token.type === TokenType.RESERVED_BINARY_COMMAND ||
   token.type === TokenType.RESERVED_JOIN ||
diff --git a/test/features/join.ts b/test/features/join.ts
@@ -56,4 +56,19 @@ export default function supportsJoin(format: FormatFn, { without, additionally }
         `);
       });
     });
+
+  it('properly uppercases JOIN, ON and USING', () => {
+    const result = format(
+      `select * from customers join foo on foo.id = customers.id join bar using (id);`,
+      { keywordCase: 'upper' }
+    );
+    expect(result).toBe(dedent`
+      SELECT
+        *
+      FROM
+        customers
+        JOIN foo ON foo.id = customers.id
+        JOIN bar USING (id);
+    `);
+  });
 }
diff --git a/test/unit/Parser.test.ts b/test/unit/Parser.test.ts
@@ -8,8 +8,7 @@ describe('Parser', () => {
       reservedDependentClauses: ['WHEN', 'ELSE'],
       reservedBinaryCommands: ['UNION'],
       reservedJoins: ['JOIN'],
-      reservedJoinConditions: ['ON', 'USING'],
-      reservedKeywords: ['BETWEEN', 'LIKE'],
+      reservedKeywords: ['BETWEEN', 'LIKE', 'ON', 'USING'],
       reservedFunctionNames: ['SQRT', 'OFFSET'],
       openParens: ['(', '['],
       closeParens: [')', ']'],
