diff --git a/Cargo.lock b/Cargo.lock index 15786de88d..1a763824a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3516,9 +3516,9 @@ dependencies = [ [[package]] name = "pgwire" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41526874eeba2f8b06a3ed14510e29080b9fab15b86849fb3a7a733c9bc610b0" +checksum = "9e30e99a0b8acf60a6815aa8178e9ffb08178ef3ca1366673bb0d6c7ababe4c2" dependencies = [ "async-trait", "bytes", diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index 6767d0fd17..f287ae28c3 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -26,7 +26,7 @@ influxdb_line_protocol = { git = "https://github.com/evenyag/influxdb_iox", bran metrics = "0.20" num_cpus = "1.13" opensrv-mysql = "0.1" -pgwire = { version = "0.3" } +pgwire = { version = "0.4" } query = { path = "../query" } serde = "1.0" serde_json = "1.0" diff --git a/src/servers/src/postgres/handler.rs b/src/servers/src/postgres/handler.rs index c0ff2e2a87..4c500403af 100644 --- a/src/servers/src/postgres/handler.rs +++ b/src/servers/src/postgres/handler.rs @@ -27,7 +27,7 @@ impl PostgresServerHandler { #[async_trait] impl SimpleQueryHandler for PostgresServerHandler { - async fn do_query(&self, _client: &C, query: &str) -> PgWireResult + async fn do_query(&self, _client: &C, query: &str) -> PgWireResult> where C: ClientInfo + Unpin + Send + Sync, { @@ -38,10 +38,10 @@ impl SimpleQueryHandler for PostgresServerHandler { .map_err(|e| PgWireError::ApiError(Box::new(e)))?; match output { - Output::AffectedRows(rows) => Ok(Response::Execution(Tag::new_for_execution( + Output::AffectedRows(rows) => Ok(vec![Response::Execution(Tag::new_for_execution( "OK", Some(rows), - ))), + ))]), Output::Stream(record_stream) => { let schema = record_stream.schema(); let recordbatches = util::collect(record_stream) @@ -60,7 +60,7 @@ impl SimpleQueryHandler for PostgresServerHandler { fn recordbatches_to_query_response<'a, I>( recordbatches: I, schema: SchemaRef, -) -> PgWireResult +) -> PgWireResult> where I: Iterator, { @@ -77,7 +77,7 @@ where } } - Ok(Response::Query(builder.build())) + Ok(vec![Response::Query(builder.build())]) } fn schema_to_pg(origin: SchemaRef) -> Result> {