Skip to content

Commit b8e339c

Browse files
mjgartonsunng87
authored andcommitted
Upgrade pgwire
Upgrade pgwire to 0.28
1 parent 3248cd6 commit b8e339c

File tree

3 files changed

+62
-35
lines changed

3 files changed

+62
-35
lines changed

Cargo.lock

Lines changed: 50 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ resolver = "2"
33
members = ["datafusion-postgres", "datafusion-postgres-cli"]
44

55
[workspace.dependencies]
6-
pgwire = "0.25"
6+
pgwire = "0.28"
77
datafusion = { version = "43", default-features = false }
88
tokio = { version = "1", default-features = false }
99

datafusion-postgres/src/handlers.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@ use pgwire::api::query::{ExtendedQueryHandler, SimpleQueryHandler};
1111
use pgwire::api::results::{DescribePortalResponse, DescribeStatementResponse, Response};
1212
use pgwire::api::stmt::QueryParser;
1313
use pgwire::api::stmt::StoredStatement;
14-
use pgwire::api::{ClientInfo, PgWireHandlerFactory, Type};
14+
use pgwire::api::{ClientInfo, NoopErrorHandler, PgWireServerHandlers, Type};
1515
use pgwire::error::{PgWireError, PgWireResult};
1616

1717
use crate::datatypes::{self, into_pg_type};
1818

1919
pub struct HandlerFactory(pub Arc<DfSessionService>);
2020

21-
impl PgWireHandlerFactory for HandlerFactory {
22-
type StartupHandler = NoopStartupHandler;
21+
impl NoopStartupHandler for DfSessionService {}
22+
23+
impl PgWireServerHandlers for HandlerFactory {
24+
type StartupHandler = DfSessionService;
2325
type SimpleQueryHandler = DfSessionService;
2426
type ExtendedQueryHandler = DfSessionService;
2527
type CopyHandler = NoopCopyHandler;
28+
type ErrorHandler = NoopErrorHandler;
2629

2730
fn simple_query_handler(&self) -> Arc<Self::SimpleQueryHandler> {
2831
self.0.clone()
@@ -33,12 +36,16 @@ impl PgWireHandlerFactory for HandlerFactory {
3336
}
3437

3538
fn startup_handler(&self) -> Arc<Self::StartupHandler> {
36-
Arc::new(NoopStartupHandler)
39+
self.0.clone()
3740
}
3841

3942
fn copy_handler(&self) -> Arc<Self::CopyHandler> {
4043
Arc::new(NoopCopyHandler)
4144
}
45+
46+
fn error_handler(&self) -> Arc<Self::ErrorHandler> {
47+
Arc::new(NoopErrorHandler)
48+
}
4249
}
4350

4451
pub struct DfSessionService {

0 commit comments

Comments
 (0)