Remove duplication of postProcess() function in MariaDB-like formatters

sql-formatter-org · Aug 31, 2023 · 6c52e60 · 6c52e60
1 parent c1c3ca1
commit 6c52e60
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 51 deletions.
diff --git a/src/languages/mariadb/likeMariaDb.ts b/src/languages/mariadb/likeMariaDb.ts
@@ -0,0 +1,19 @@
+import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+
+// Shared functionality used by all MariaDB-like SQL dialects.
+
+export function postProcess(tokens: Token[]) {
+  return tokens.map((token, i) => {
+    const nextToken = tokens[i + 1] || EOF_TOKEN;
+    if (isToken.SET(token) && nextToken.text === '(') {
+      // This is SET datatype, not SET statement
+      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
+    }
+    const prevToken = tokens[i - 1] || EOF_TOKEN;
+    if (isToken.VALUES(token) && prevToken.text === '=') {
+      // This is VALUES() function, not VALUES clause
+      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
+    }
+    return token;
+  });
+}
diff --git a/src/languages/mariadb/mariadb.formatter.ts b/src/languages/mariadb/mariadb.formatter.ts
@@ -1,6 +1,6 @@
 import { DialectOptions } from '../../dialect.js';
 import { expandPhrases } from '../../expandPhrases.js';
-import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+import { postProcess } from './likeMariaDb.js';
 import { keywords } from './mariadb.keywords.js';
 import { functions } from './mariadb.functions.js';
 
@@ -297,19 +297,3 @@ export const mariadb: DialectOptions = {
     onelineClauses,
   },
 };
-
-function postProcess(tokens: Token[]) {
-  return tokens.map((token, i) => {
-    const nextToken = tokens[i + 1] || EOF_TOKEN;
-    if (isToken.SET(token) && nextToken.text === '(') {
-      // This is SET datatype, not SET statement
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    const prevToken = tokens[i - 1] || EOF_TOKEN;
-    if (isToken.VALUES(token) && prevToken.text === '=') {
-      // This is VALUES() function, not VALUES clause
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    return token;
-  });
-}
diff --git a/src/languages/mysql/mysql.formatter.ts b/src/languages/mysql/mysql.formatter.ts
@@ -1,6 +1,6 @@
 import { DialectOptions } from '../../dialect.js';
 import { expandPhrases } from '../../expandPhrases.js';
-import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+import { postProcess } from '../mariadb/likeMariaDb.js';
 import { keywords } from './mysql.keywords.js';
 import { functions } from './mysql.functions.js';
 
@@ -264,19 +264,3 @@ export const mysql: DialectOptions = {
     onelineClauses,
   },
 };
-
-function postProcess(tokens: Token[]) {
-  return tokens.map((token, i) => {
-    const nextToken = tokens[i + 1] || EOF_TOKEN;
-    if (isToken.SET(token) && nextToken.text === '(') {
-      // This is SET datatype, not SET statement
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    const prevToken = tokens[i - 1] || EOF_TOKEN;
-    if (isToken.VALUES(token) && prevToken.text === '=') {
-      // This is VALUES() function, not VALUES clause
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    return token;
-  });
-}
diff --git a/src/languages/singlestoredb/singlestoredb.formatter.ts b/src/languages/singlestoredb/singlestoredb.formatter.ts
@@ -1,6 +1,6 @@
 import { DialectOptions } from '../../dialect.js';
 import { expandPhrases } from '../../expandPhrases.js';
-import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+import { postProcess } from '../mariadb/likeMariaDb.js';
 import { keywords } from './singlestoredb.keywords.js';
 import { functions } from './singlestoredb.functions.js';
 
@@ -278,19 +278,3 @@ export const singlestoredb: DialectOptions = {
     onelineClauses,
   },
 };
-
-function postProcess(tokens: Token[]) {
-  return tokens.map((token, i) => {
-    const nextToken = tokens[i + 1] || EOF_TOKEN;
-    if (isToken.SET(token) && nextToken.text === '(') {
-      // This is SET datatype, not SET statement
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    const prevToken = tokens[i - 1] || EOF_TOKEN;
-    if (isToken.VALUES(token) && prevToken.text === '=') {
-      // This is VALUES() function, not VALUES clause
-      return { ...token, type: TokenType.RESERVED_FUNCTION_NAME };
-    }
-    return token;
-  });
-}