Skip to content

Commit

Permalink
feat: upgrade rustls library family, opensrv-mysql and pgwire (#2927)
Browse files Browse the repository at this point in the history
* feat: deps up

* fmt: toml format
  • Loading branch information
sunng87 authored Dec 14, 2023
1 parent 181e16a commit 39f8087
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 61 deletions.
148 changes: 112 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/servers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ lazy_static.workspace = true
mime_guess = "2.0"
once_cell.workspace = true
openmetrics-parser = "0.4"
opensrv-mysql = "0.5"
opensrv-mysql = "0.6"
opentelemetry-proto.workspace = true
parking_lot = "0.12"
pgwire = "0.16"
pgwire = "0.17"
pin-project = "1.0"
postgres-types = { version = "0.2", features = ["with-chrono-0_4"] }
pprof = { version = "0.13", features = [
Expand All @@ -72,8 +72,9 @@ query.workspace = true
rand.workspace = true
regex.workspace = true
rust-embed = { version = "6.6", features = ["debug-embed"] }
rustls = "0.21"
rustls-pemfile = "1.0"
rustls = "0.22"
rustls-pemfile = "2.0"
rustls-pki-types = "1.0"
schemars = "0.8"
secrecy = { version = "0.8", features = ["serde", "alloc"] }
serde.workspace = true
Expand All @@ -85,7 +86,7 @@ snap = "1"
sql.workspace = true
strum.workspace = true
table.workspace = true
tokio-rustls = "0.24"
tokio-rustls = "0.25"
tokio-stream = { workspace = true, features = ["net"] }
tokio.workspace = true
tonic-reflection = "0.10"
Expand All @@ -108,13 +109,12 @@ mysql_async = { version = "0.33", default-features = false, features = [
"default-rustls",
] }
rand.workspace = true
rustls = { version = "0.21", features = ["dangerous_configuration"] }
script = { workspace = true, features = ["python"] }
serde_json = "1.0"
session = { workspace = true, features = ["testing"] }
table.workspace = true
tokio-postgres = "0.7"
tokio-postgres-rustls = "0.10"
tokio-postgres-rustls = { git = "https://github.com/ol-teuto/tokio-postgres-rustls.git", branch = "rustls-update" }
tokio-test = "0.4"

[build-dependencies]
Expand Down
6 changes: 5 additions & 1 deletion src/servers/src/postgres/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ use crate::SqlPlan;

#[async_trait]
impl SimpleQueryHandler for PostgresServerHandler {
async fn do_query<'a, C>(&self, _client: &C, query: &'a str) -> PgWireResult<Vec<Response<'a>>>
async fn do_query<'a, C>(
&self,
_client: &mut C,
query: &'a str,
) -> PgWireResult<Vec<Response<'a>>>
where
C: ClientInfo + Unpin + Send + Sync,
{
Expand Down
Loading

0 comments on commit 39f8087

Please sign in to comment.