From fad136b9ab43feafa3539d4d8c23a4c8e6189b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 25 Nov 2024 15:18:39 +0000
Subject: [PATCH] chore: upgrade sqlformat-rs to non-forked version (#27063)

---
 Cargo.lock     | 26 +++++++++++++-------------
 cli/Cargo.toml |  3 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e929168f5..e7229dcceb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1232,7 +1232,6 @@ dependencies = [
  "deno_resolver",
  "deno_runtime",
  "deno_semver",
- "deno_sqlformat",
  "deno_task_shell",
  "deno_terminal 0.2.0",
  "deno_tower_lsp",
@@ -1292,6 +1291,7 @@ dependencies = [
  "sha2",
  "shell-escape",
  "spki",
+ "sqlformat",
  "strsim",
  "tar",
  "tempfile",
@@ -2147,18 +2147,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "deno_sqlformat"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e196799ec0cc240fac1fb5c5bf813ef92a9602740a059cfcbb20593b2deee52"
-dependencies = [
- "nom 7.1.3",
- "once_cell",
- "regex",
- "unicode_categories",
-]
-
 [[package]]
 name = "deno_task_shell"
 version = "0.18.1"
@@ -6944,6 +6932,18 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "sqlformat"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c38684453189293372e6fffa3bed1015d20488ce4cc09a23de050fd7411e46"
+dependencies = [
+ "nom 7.1.3",
+ "once_cell",
+ "regex",
+ "unicode_categories",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 6a1fc51bc4..ce9dbe9230 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -151,8 +151,7 @@ serde_repr.workspace = true
 sha2.workspace = true
 shell-escape = "=0.1.5"
 spki = { version = "0.7", features = ["pem"] }
-# NOTE(bartlomieju): using temporary fork for now, revert back to `sqlformat-rs` later
-sqlformat = { package = "deno_sqlformat", version = "0.3.2" }
+sqlformat = "=0.3.2"
 strsim = "0.11.1"
 tar.workspace = true
 tempfile.workspace = true