diff --git a/Cargo.lock b/Cargo.lock index 83c8003b55..c14b4fd7f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8428,9 +8428,9 @@ dependencies = [ [[package]] name = "pgwire" -version = "0.29.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e6fcdc2ae2173ef8ee1005b6e46453d45195ac3d97caac0db7ecf64ab4aa85" +checksum = "ec79ee18e6cafde8698885646780b967ecc905120798b8359dd0da64f9688e89" dependencies = [ "async-trait", "bytes", diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index 754f4f1e22..d3d299a155 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -87,7 +87,7 @@ opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "a1fb4d opentelemetry-proto.workspace = true otel-arrow-rust.workspace = true parking_lot.workspace = true -pgwire = { version = "0.29", default-features = false, features = ["server-api-ring"] } +pgwire = { version = "0.30", default-features = false, features = ["server-api-ring"] } pin-project = "1.0" pipeline.workspace = true postgres-types = { version = "0.2", features = ["with-chrono-0_4", "with-serde_json-1"] } diff --git a/src/servers/src/postgres/handler.rs b/src/servers/src/postgres/handler.rs index a5c68bcfaf..97c48a8ac9 100644 --- a/src/servers/src/postgres/handler.rs +++ b/src/servers/src/postgres/handler.rs @@ -49,11 +49,7 @@ use crate::SqlPlan; #[async_trait] impl SimpleQueryHandler for PostgresServerHandlerInner { #[tracing::instrument(skip_all, fields(protocol = "postgres"))] - async fn do_query<'a, C>( - &self, - client: &mut C, - query: &'a str, - ) -> PgWireResult>> + async fn do_query<'a, C>(&self, client: &mut C, query: &str) -> PgWireResult>> where C: ClientInfo + Sink + Unpin + Send + Sync, C::Error: Debug, @@ -219,7 +215,12 @@ impl DefaultQueryParser { impl QueryParser for DefaultQueryParser { type Statement = SqlPlan; - async fn parse_sql(&self, sql: &str, _types: &[Type]) -> PgWireResult { + async fn parse_sql( + &self, + _client: &C, + sql: &str, + _types: &[Type], + ) -> PgWireResult { crate::metrics::METRIC_POSTGRES_PREPARED_COUNT.inc(); let query_ctx = self.session.new_query_context(); @@ -282,7 +283,7 @@ impl ExtendedQueryHandler for PostgresServerHandlerInner { async fn do_query<'a, C>( &self, client: &mut C, - portal: &'a Portal, + portal: &Portal, _max_rows: usize, ) -> PgWireResult> where