From ba6e882b950275ddfa4043e409a4bd6488fc5c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <philip@peerdb.io>
Date: Sat, 13 Jan 2024 05:23:55 +0000
Subject: [PATCH] revert sqlparser-rs to 0.40 fork

---
 nexus/Cargo.lock                | 6 +++---
 nexus/Cargo.toml                | 3 +++
 nexus/analyzer/Cargo.toml       | 2 +-
 nexus/parser/Cargo.toml         | 2 +-
 nexus/peer-bigquery/Cargo.toml  | 2 +-
 nexus/peer-cursor/Cargo.toml    | 2 +-
 nexus/peer-postgres/Cargo.toml  | 2 +-
 nexus/peer-snowflake/Cargo.toml | 2 +-
 nexus/pt/Cargo.toml             | 2 +-
 nexus/server/Cargo.toml         | 2 +-
 10 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/nexus/Cargo.lock b/nexus/Cargo.lock
index ff089723c4..b2d92c00d8 100644
--- a/nexus/Cargo.lock
+++ b/nexus/Cargo.lock
@@ -2994,8 +2994,8 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.41.0"
-source = "git+https://github.com/peerdb-io/sqlparser-rs.git#9fbfb423db7fc0949dea2b1400cb5ef848426409"
+version = "0.40.0"
+source = "git+https://github.com/peerdb-io/sqlparser-rs.git?rev=e2a651ace85013fca48b98867789ca159d307276#e2a651ace85013fca48b98867789ca159d307276"
 dependencies = [
  "log",
  "sqlparser_derive",
@@ -3004,7 +3004,7 @@ dependencies = [
 [[package]]
 name = "sqlparser_derive"
 version = "0.2.1"
-source = "git+https://github.com/peerdb-io/sqlparser-rs.git#9fbfb423db7fc0949dea2b1400cb5ef848426409"
+source = "git+https://github.com/peerdb-io/sqlparser-rs.git?rev=e2a651ace85013fca48b98867789ca159d307276#e2a651ace85013fca48b98867789ca159d307276"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
index 2aaa406ac5..034d2009f3 100644
--- a/nexus/Cargo.toml
+++ b/nexus/Cargo.toml
@@ -16,3 +16,6 @@ members = [
 ]
 
 resolver = "2"
+
+[workspace.dependencies]
+sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git", features = ["visitor"], rev = "e2a651ace85013fca48b98867789ca159d307276" }
diff --git a/nexus/analyzer/Cargo.toml b/nexus/analyzer/Cargo.toml
index 6ce963eeb7..bc59ef7491 100644
--- a/nexus/analyzer/Cargo.toml
+++ b/nexus/analyzer/Cargo.toml
@@ -12,5 +12,5 @@ catalog = { path = "../catalog" }
 flow-rs = { path = "../flow-rs" }
 pem = "3.0"
 pt = { path = "../pt" }
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git", features = ["visitor"] }
+sqlparser.workspace = true
 serde_json = "1.0"
diff --git a/nexus/parser/Cargo.toml b/nexus/parser/Cargo.toml
index 9b6a05ff33..8b272b3e75 100644
--- a/nexus/parser/Cargo.toml
+++ b/nexus/parser/Cargo.toml
@@ -13,6 +13,6 @@ futures = { version = "0.3.28", features = ["executor"] }
 pgwire = "0.19"
 pt = { path = "../pt" }
 rand = "0.8"
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
diff --git a/nexus/peer-bigquery/Cargo.toml b/nexus/peer-bigquery/Cargo.toml
index f393497465..b05a5d5d66 100644
--- a/nexus/peer-bigquery/Cargo.toml
+++ b/nexus/peer-bigquery/Cargo.toml
@@ -19,7 +19,7 @@ rust_decimal = { version = "1.30.0", features = ["db-tokio-postgres"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_bytes = "0.11"
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 tracing = "0.1"
 tokio = { version = "1.0", features = ["full"] }
 gcp-bigquery-client = "0.18"
diff --git a/nexus/peer-cursor/Cargo.toml b/nexus/peer-cursor/Cargo.toml
index d2916a43f9..e47a6bd0df 100644
--- a/nexus/peer-cursor/Cargo.toml
+++ b/nexus/peer-cursor/Cargo.toml
@@ -10,6 +10,6 @@ anyhow = "1.0"
 async-trait = "0.1"
 futures = "0.3"
 pgwire = "0.19"
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 tokio = { version = "1.0", features = ["full"] }
 value = { path = "../value" }
diff --git a/nexus/peer-postgres/Cargo.toml b/nexus/peer-postgres/Cargo.toml
index a886392639..96cc7af541 100644
--- a/nexus/peer-postgres/Cargo.toml
+++ b/nexus/peer-postgres/Cargo.toml
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_bytes = "0.11"
 postgres-inet = "0.19.0"
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 tokio = { version = "1.0", features = ["full"] }
 tokio-postgres = { version = "0.7.6", features = [
   "with-chrono-0_4",
diff --git a/nexus/peer-snowflake/Cargo.toml b/nexus/peer-snowflake/Cargo.toml
index d663cece0f..6010a56da2 100644
--- a/nexus/peer-snowflake/Cargo.toml
+++ b/nexus/peer-snowflake/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 catalog = { path = "../catalog" }
 peer-cursor = { path = "../peer-cursor" }
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 value = { path = "../value" }
 tracing = "0.1"
 secrecy = { version = "0.8.0" }
diff --git a/nexus/pt/Cargo.toml b/nexus/pt/Cargo.toml
index fc9aaaeeaf..5ac1e0c0f2 100644
--- a/nexus/pt/Cargo.toml
+++ b/nexus/pt/Cargo.toml
@@ -11,7 +11,7 @@ prost = "0.12"
 prost-types = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git" }
+sqlparser.workspace = true
 tonic = "0.10"
 tonic-reflection = "0.10"
 pbjson = "0.6"
diff --git a/nexus/server/Cargo.toml b/nexus/server/Cargo.toml
index 4104d09b3c..ef87fe78d3 100644
--- a/nexus/server/Cargo.toml
+++ b/nexus/server/Cargo.toml
@@ -50,7 +50,7 @@ peerdb-parser = { path = "../parser" }
 pgwire = "0.19"
 prost = "0.12"
 pt = { path = "../pt" }
-sqlparser = { git = "https://github.com/peerdb-io/sqlparser-rs.git", features = ["visitor"] }
+sqlparser.workspace = true
 serde_json = "1.0"
 rand = "0.8"
 time = "0.3"