diff --git a/package-lock.json b/package-lock.json
index fe51559e796..e8e6e153bcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,8 @@
         "eslint": "^7.32.0",
         "eslint-config-custom": "*",
         "json-stringify-safe": "^5.0.1",
-        "prettier": "^2.5.1",
+        "prettier": "^2.8.4",
+        "prettier-plugin-sql-cst": "^0.5.0",
         "ts-jest": "^27.0.7",
         "turbo": "^1.4.7"
       },
@@ -30357,9 +30358,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz",
-      "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -30391,6 +30392,16 @@
         "prettier": "^2.0.0"
       }
     },
+    "node_modules/prettier-plugin-sql-cst": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-sql-cst/-/prettier-plugin-sql-cst-0.5.0.tgz",
+      "integrity": "sha512-uyYaeSCfI6cCW1u+fZatzlirT9dEN5npqwHwFhxOH/aE53BPunE1a6c1fWFgZjYF2Mkdf8B7xL8aBpVKJCcfHA==",
+      "dev": true,
+      "dependencies": {
+        "prettier": "^2.8.2",
+        "sql-parser-cst": "^0.12.0"
+      }
+    },
     "node_modules/pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -34436,6 +34447,12 @@
         "sql-formatter": "bin/sql-formatter-cli.js"
       }
     },
+    "node_modules/sql-parser-cst": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/sql-parser-cst/-/sql-parser-cst-0.12.1.tgz",
+      "integrity": "sha512-J1jIkXuZGyEYJjRBalF2FRrhyfD/P2zaUGiHsBhLvs9PsC9g7sN9Q5LZhA4xlONOKW+825vxE1vx0Dm8dwwZvg==",
+      "dev": true
+    },
     "node_modules/sqlstring": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
@@ -62358,9 +62375,9 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "prettier": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz",
-      "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "dev": true
     },
     "prettier-plugin-sql": {
@@ -62374,6 +62391,16 @@
         "tslib": "^2.4.0"
       }
     },
+    "prettier-plugin-sql-cst": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-sql-cst/-/prettier-plugin-sql-cst-0.5.0.tgz",
+      "integrity": "sha512-uyYaeSCfI6cCW1u+fZatzlirT9dEN5npqwHwFhxOH/aE53BPunE1a6c1fWFgZjYF2Mkdf8B7xL8aBpVKJCcfHA==",
+      "dev": true,
+      "requires": {
+        "prettier": "^2.8.2",
+        "sql-parser-cst": "^0.12.0"
+      }
+    },
     "pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -65353,6 +65380,12 @@
         "nearley": "^2.20.1"
       }
     },
+    "sql-parser-cst": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/sql-parser-cst/-/sql-parser-cst-0.12.1.tgz",
+      "integrity": "sha512-J1jIkXuZGyEYJjRBalF2FRrhyfD/P2zaUGiHsBhLvs9PsC9g7sN9Q5LZhA4xlONOKW+825vxE1vx0Dm8dwwZvg==",
+      "dev": true
+    },
     "sqlstring": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
diff --git a/package.json b/package.json
index 38b3d211f9f..0874465f301 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,8 @@
     "eslint": "^7.32.0",
     "eslint-config-custom": "*",
     "json-stringify-safe": "^5.0.1",
-    "prettier": "^2.5.1",
+    "prettier": "^2.8.4",
+    "prettier-plugin-sql-cst": "^0.5.0",
     "ts-jest": "^27.0.7",
     "turbo": "^1.4.7"
   },