feat(formatter): upgrade sql-formatter from 2 to 4

hckhanh · hckhanh · commit 0120cdf64d4b · 2021-04-04T08:47:43.000+07:00
diff --git a/.eslintrc b/.eslintrc
@@ -3,8 +3,6 @@
     "oclif",
     "oclif-typescript",
     "plugin:prettier/recommended",
-    "prettier/standard",
-    "prettier/@typescript-eslint",
     "plugin:jest/recommended"
   ]
 }
diff --git a/.prettierignore b/.prettierignore
@@ -8,7 +8,3 @@ coverage
 
 # Misc
 te?mp
-
-# Yarn
-.yarn
-.pnp.*
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 A CLI tool to convert query from PostgreSQL to BigQuery
 
+[![deepcode](https://www.deepcode.ai/api/gh/badge?key=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwbGF0Zm9ybTEiOiJnaCIsIm93bmVyMSI6Imhja2hhbmgiLCJyZXBvMSI6InBnMmJpZ3F1ZXJ5IiwiaW5jbHVkZUxpbnQiOmZhbHNlLCJhdXRob3JJZCI6Mjg0MzQsImlhdCI6MTYxNzQ5NzY2MX0.RKs5KwUX_1aAQz-K1LyWD7HvjGi3zcIHhb-CVdZckE4)](https://www.deepcode.ai/app/gh/hckhanh/pg2bigquery/_/dashboard?utm_content=gh%2Fhckhanh%2Fpg2bigquery)
 ![Release](https://github.com/hckhanh/pg2bigquery/workflows/Release/badge.svg)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/hckhanh/pg2bigquery.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hckhanh/pg2bigquery/context:javascript)
 [![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
diff --git a/__tests__/core.ts b/__tests__/core.ts
@@ -1,4 +1,4 @@
-import sqlFormatter from "sql-formatter";
+import { format } from "sql-formatter";
 import { postgres2Bigquery } from "../src/core";
 import { getTableRegexes } from "../src/utils";
 
@@ -25,24 +25,28 @@ describe("core", () => {
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should add prefix dataset to tables", async () => {
     const query = `
       SELECT created_at AS start_date, role, id
-      FROM users, roles
-      WHERE users.id = roles.user_id and role = 'admin';
+      FROM users,
+           roles
+      WHERE users.id = roles.user_id
+        and role = 'admin';
     `;
 
     const expectedQuery = `
       SELECT created_at AS start_date, role, id
-      FROM demo_dataset.users, demo_dataset.roles
-      WHERE users.id = roles.user_id and role = 'admin';
+      FROM demo_dataset.users,
+           demo_dataset.roles
+      WHERE users.id = roles.user_id
+        and role = 'admin';
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should convert time calculations", async () => {
@@ -55,11 +59,12 @@ describe("core", () => {
     const expectedQuery = `
       SELECT *
       FROM demo_dataset.users
-      WHERE created_at > (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 30 DAY)) and created_at <= (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 180 DAY));
+      WHERE created_at > (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 30 DAY))
+        and created_at <= (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 180 DAY));
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should find products with product id array", async () => {
@@ -76,7 +81,7 @@ describe("core", () => {
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should find products not in product id array", async () => {
@@ -93,24 +98,26 @@ describe("core", () => {
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should remove quotes for all numbers", async () => {
     const query = `
       SELECT *
       FROM products
-      WHERE id = '9' or id = 10;
+      WHERE id = '9'
+         or id = 10;
     `;
 
     const expectedQuery = `
       SELECT *
       FROM demo_dataset.products
-      WHERE id = 9 or id = 10;
+      WHERE id = 9
+         or id = 10;
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should convert date_part function", async () => {
@@ -125,37 +132,37 @@ describe("core", () => {
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 
   it("should cast else case of date_part to string", async () => {
     const query = `
-      SELECT
-        id,
-        name,
-        date_part('day'::text, created_at) AS year,
+      SELECT id,
+             name,
+             date_part('day'::text, created_at) AS year,
         CASE
           WHEN date_part('month', created_at) < 10
           THEN concat('0', date_part('month', created_at))
           ELSE date_part('month', created_at)
-        END AS month
+      END
+      AS month
       FROM products;
     `;
 
     const expectedQuery = `
-      SELECT
-        id,
-        name,
-        EXTRACT(DAY FROM created_at) AS year,
+      SELECT id,
+             name,
+             EXTRACT(DAY FROM created_at) AS year,
         CASE
           WHEN EXTRACT(MONTH FROM created_at) < 10 THEN concat(0, EXTRACT(MONTH FROM created_at))
           ELSE CAST(EXTRACT(MONTH FROM created_at) AS STRING)
-        END AS month
+      END
+      AS month
       FROM
         demo_dataset.products;
     `;
 
     const bQuery = postgres2Bigquery(query, "demo_dataset", tableRegexes);
-    expect(bQuery).toBe(sqlFormatter.format(expectedQuery));
+    expect(bQuery).toBe(format(expectedQuery));
   });
 });
diff --git a/package.json b/package.json
@@ -10,33 +10,33 @@
   "dependencies": {
     "@oclif/command": "^1.8.0",
     "@oclif/config": "^1.17.0",
-    "@oclif/plugin-help": "^3.2.0",
+    "@oclif/plugin-help": "^3.2.2",
     "cli-ux": "^5.5.1",
-    "sql-formatter": "^2.3.3",
+    "sql-formatter": "^4.0.2",
     "tslib": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/preset-env": "^7.12.10",
-    "@babel/preset-typescript": "^7.12.7",
+    "@babel/core": "^7.13.14",
+    "@babel/preset-env": "^7.13.12",
+    "@babel/preset-typescript": "^7.13.0",
     "@oclif/dev-cli": "^1.26.0",
-    "@types/jest": "^26.0.19",
-    "@types/node": "^14.14.12",
-    "@types/sql-formatter": "^2.3.0",
+    "@types/jest": "^26",
+    "@types/node": "^14",
+    "@types/sql-formatter": "^2",
     "babel-jest": "^26.6.3",
-    "eslint": "^7.15.0",
+    "eslint": "^7.23.0",
     "eslint-config-oclif": "^3.1",
     "eslint-config-oclif-typescript": "^0.2.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-prettier": "^3.2.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-jest": "^24.3.3",
+    "eslint-plugin-prettier": "^3.3.1",
     "jest": "^26.6.3",
     "jest-get-type": "^26.3.0",
     "prettier": "2.2.1",
     "rimraf": "^3.0.2",
-    "semantic-release": "^17.3.0",
+    "semantic-release": "^17.4.2",
     "ts-node": "^9.1.1",
-    "typescript": "4.1.3"
+    "typescript": "4.2.3"
   },
   "engines": {
     "node": ">=12"
diff --git a/src/core.ts b/src/core.ts
@@ -1,4 +1,4 @@
-import sqlFormatter from "sql-formatter";
+import { format } from "sql-formatter";
 import { dataTypeRegexes } from "./postgres";
 
 const timeOperators: { [operator: string]: string } = {
@@ -105,7 +105,7 @@ export function postgres2Bigquery(
   dataset: string,
   tableRegexes: RegExp[]
 ): string {
-  let bQuery = sqlFormatter.format(pgQuery);
+  let bQuery = format(pgQuery, { language: "postgresql" });
 
   bQuery = removeTypeCasts(bQuery);
   bQuery = addPrefixDatasetToTables(tableRegexes, bQuery, dataset);
@@ -116,5 +116,5 @@ export function postgres2Bigquery(
   bQuery = convertDatePartFunction(bQuery);
   bQuery = castElseCaseToString(bQuery);
 
-  return sqlFormatter.format(bQuery);
+  return format(bQuery);
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`"oclif",`
`4`	`4`	`"oclif-typescript",`
`5`	`5`	`"plugin:prettier/recommended",`
`6`		`- "prettier/standard",`
`7`		`- "prettier/@typescript-eslint",`
`8`	`6`	`"plugin:jest/recommended"`
`9`	`7`	`]`
`10`	`8`	`}`
-Original file line number
+Diff line change
 # Misc
 te?mp
+-
 -# Yarn
 -.yarn
 -.pnp.*