Update cargo dependencies

Leave pgwire & cargo-deb for now, seems to be more involved sqlparser will be updated by updating forks with upstream Code changes were required for two dependencies: 1. gcp-bigquery-client bringing in two new field types (geo & json, implemented with todo!()) 2. prost 0.12 deprecated DbType::from_i32 in favor of TryFrom<i32>, changing result from `Option<DbType>` to `Result<DbType, _>`
PeerDB-io · Nov 4, 2023 · 46ed7c0 · 46ed7c0
1 parent b2c9686
commit 46ed7c0
Show file tree

Hide file tree

Showing 13 changed files with 485 additions and 479 deletions.
diff --git a/nexus/Cargo.lock b/nexus/Cargo.lock
diff --git a/nexus/analyzer/Cargo.toml b/nexus/analyzer/Cargo.toml
@@ -11,7 +11,7 @@ async-trait = "0.1"
 catalog = { path = "../catalog" }
 flow-rs = { path = "../flow-rs" }
 lazy_static = "1.4"
-pem = "1.1.0"
+pem = "3.0"
 pt = { path = "../pt" }
 sqlparser = { path = "../sqlparser-rs", features = ["visitor"] }
 serde_json = "1.0"
diff --git a/nexus/catalog/Cargo.toml b/nexus/catalog/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 chrono = { version = "0.4.22", default-features = false }
-prost = "0.11"
+prost = "0.12"
 peer-cursor = { path = "../peer-cursor" }
 peer-postgres = { path = "../peer-postgres" }
 pt = { path = "../pt" }
@@ -17,7 +17,7 @@ tokio = { version = "1.13.0", features = ["full"] }
 tokio-postgres = { version = "0.7.6", features = [
   "with-chrono-0_4",
   "with-serde_json-1",
-  "with-uuid-0_8",
+  "with-uuid-1",
 ] }
 tracing = "0.1.29"
 serde_json = "1.0"

diff --git a/nexus/catalog/src/lib.rs b/nexus/catalog/src/lib.rs
@@ -196,8 +196,8 @@ impl Catalog {
         self.pg
             .query_opt(&stmt, &[&peer_id])
             .await?
-            .map(|row| row.get(0))
-            .map(|r#type| DbType::from_i32(r#type).unwrap()) // if row was inserted properly, this should never fail
+            .map(|row| row.get::<usize, i32>(0))
+            .and_then(|r#type| DbType::try_from(r#type).ok()) // if row was inserted properly, this should never fail
             .context("Failed to get peer type")
     }
 
@@ -215,7 +215,7 @@ impl Catalog {
             let name: &str = row.get(1);
             let peer_type: i32 = row.get(2);
             let options: &[u8] = row.get(3);
-            let db_type = DbType::from_i32(peer_type);
+            let db_type = DbType::try_from(peer_type).ok();
             let config = self.get_config(db_type, name, options).await?;
 
             let peer = Peer {
@@ -244,7 +244,7 @@ impl Catalog {
             let name: &str = row.get(1);
             let peer_type: i32 = row.get(2);
             let options: &[u8] = row.get(3);
-            let db_type = DbType::from_i32(peer_type);
+            let db_type = DbType::try_from(peer_type).ok();
             let config = self.get_config(db_type, name, options).await?;
 
             let peer = Peer {
@@ -271,7 +271,7 @@ impl Catalog {
             let name: &str = row.get(0);
             let peer_type: i32 = row.get(1);
             let options: &[u8] = row.get(2);
-            let db_type = DbType::from_i32(peer_type);
+            let db_type = DbType::try_from(peer_type).ok();
             let config = self.get_config(db_type, name, options).await?;
 
             let peer = Peer {

diff --git a/nexus/flow-rs/Cargo.toml b/nexus/flow-rs/Cargo.toml
@@ -17,7 +17,7 @@ reqwest = { version = "0.11", features = [
 ] }
 anyhow = "1.0"
 tracing = "0.1"
-tonic = "0.9"
-tonic-health = "0.9"
+tonic = "0.10"
+tonic-health = "0.10"
 pt = { path = "../pt" }
 catalog = { path = "../catalog" }
diff --git a/nexus/peer-bigquery/Cargo.toml b/nexus/peer-bigquery/Cargo.toml
@@ -23,7 +23,7 @@ serde_bytes = "0.11"
 sqlparser = { path = "../sqlparser-rs" }
 tracing = "0.1"
 tokio = { version = "1.0", features = ["full"] }
-gcp-bigquery-client = "0.14"
-uuid = { version = "0.8", features = ["serde", "v4"] }
+gcp-bigquery-client = "0.18"
+uuid = { version = "1.0", features = ["serde", "v4"] }
 value = { path = "../value" }
-yup-oauth2 = "7"
+yup-oauth2 = "8"
diff --git a/nexus/peer-bigquery/src/stream.rs b/nexus/peer-bigquery/src/stream.rs
@@ -52,6 +52,8 @@ fn convert_field_type(field_type: &FieldType) -> Type {
         FieldType::Time => Type::TIME,
         FieldType::Record => Type::JSONB,
         FieldType::Struct => Type::JSONB,
+        FieldType::Geography => Type::POLYGON_ARRAY,
+        FieldType::Json => Type::JSON,
     }
 }
 
@@ -156,6 +158,8 @@ impl BqRecordStream {
                     }
                     FieldType::Record => todo!(),
                     FieldType::Struct => todo!(),
+                    FieldType::Geography => todo!(),
+                    FieldType::Json => todo!(),
                 },
             };
             values.push(value.unwrap_or(Value::Null));

diff --git a/nexus/peer-connections/Cargo.toml b/nexus/peer-connections/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0"
 chrono = { version = "0.4" }
-deadpool-postgres = { version = "0.10", features = ["rt_tokio_1"] }
+deadpool-postgres = { version = "0.11", features = ["rt_tokio_1"] }
 tokio = { version = "1", features = ["full"] }
 tokio-postgres = { version = "0.7.6", features = [
   "with-chrono-0_4",
   "with-serde_json-1",
-  "with-uuid-0_8",
+  "with-uuid-1",
 ] }
 tracing = "0.1"
-uuid = { version = "0.8" }
+uuid = { version = "1.0" }
diff --git a/nexus/peer-postgres/Cargo.toml b/nexus/peer-postgres/Cargo.toml
@@ -27,8 +27,8 @@ tokio = { version = "1.0", features = ["full"] }
 tokio-postgres = { version = "0.7.6", features = [
   "with-chrono-0_4",
   "with-serde_json-1",
-  "with-uuid-0_8",
+  "with-uuid-1",
 ] }
 tracing = "0.1"
-uuid = { version = "0.8", features = ["serde", "v4"] }
+uuid = { version = "1.0", features = ["serde", "v4"] }
 value = { path = "../value" }
diff --git a/nexus/peer-snowflake/Cargo.toml b/nexus/peer-snowflake/Cargo.toml
@@ -14,7 +14,7 @@ tracing = "0.1"
 pgerror = { path = "../pgerror" }
 secrecy = { version = "0.8.0" }
 async-trait = "0.1.57"
-jsonwebtoken = { version = "8.0", features = ["use_pem"] }
+jsonwebtoken = { version = "9.0", features = ["use_pem"] }
 base64 = "0.21"
 dashmap = "5.0"
 pgwire = "0.15"

diff --git a/nexus/pt/Cargo.toml b/nexus/pt/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2021"
 
 [dependencies]
 bytes = "1.1"
-prost = "0.11"
-prost-types = "0.11"
+prost = "0.12"
+prost-types = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sqlparser = { path = "../sqlparser-rs" }
-tonic = "0.9"
-tonic-reflection = "0.9"
-pbjson = "0.5"
-pbjson-types = "0.5.1"
+tonic = "0.10"
+tonic-reflection = "0.10"
+pbjson = "0.6"
+pbjson-types = "0.6"
diff --git a/nexus/server/Cargo.toml b/nexus/server/Cargo.toml
@@ -34,7 +34,7 @@ async-trait = "0.1"
 bytes = "1.0"
 catalog = { path = "../catalog" }
 clap = { version = "4.0", features = ["derive", "env"] }
-console-subscriber = "0.1"
+console-subscriber = "0.2"
 dashmap = "5.0"
 dotenvy = "0.15.7"
 flow-rs = { path = "../flow-rs" }
@@ -46,7 +46,7 @@ peer-postgres = { path = "../peer-postgres" }
 peer-snowflake = { path = "../peer-snowflake" }
 peerdb-parser = { path = "../parser" }
 pgwire = "0.15"
-prost = "0.11"
+prost = "0.12"
 pt = { path = "../pt" }
 sqlparser = { path = "../sqlparser-rs", features = ["visitor"] }
 serde_json = "1.0"
@@ -56,7 +56,7 @@ tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = "0.3"
-uuid = "0.8"
+uuid = "1.0"
 cargo-deb = "1.43.1"
 pgerror = { path = "../pgerror" }
 

diff --git a/nexus/value/Cargo.toml b/nexus/value/Cargo.toml
@@ -17,4 +17,4 @@ hex = "0.4"
 pgwire = "0.15"
 postgres = { version = "0.19", features = ["with-chrono-0_4"] }
 postgres-types = { version = "0.2.5", features = ["array-impls"] }
-uuid = { version = "0.8", features = ["serde", "v4"] }
+uuid = { version = "1.0", features = ["serde", "v4"] }