Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bytes = "1.10.1"
chrono = { version = "0.4", features = ["std"] }
datafusion = { version = "48", default-features = false }
futures = "0.3"
pgwire = { version = "0.30.2", default-features = false }
pgwire = { version = "0.31", default-features = false }
postgres-types = "0.2"
rust_decimal = { version = "1.37", features = ["db-postgres"] }
tokio = { version = "1", default-features = false }
Expand Down
24 changes: 5 additions & 19 deletions datafusion-postgres/src/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use datafusion::arrow::datatypes::DataType;
use datafusion::logical_expr::LogicalPlan;
use datafusion::prelude::*;
use pgwire::api::auth::noop::NoopStartupHandler;
use pgwire::api::copy::NoopCopyHandler;
use pgwire::api::auth::StartupHandler;
use pgwire::api::portal::{Format, Portal};
use pgwire::api::query::{ExtendedQueryHandler, SimpleQueryHandler};
use pgwire::api::results::{
Expand All @@ -16,7 +16,7 @@ use pgwire::api::results::{
};
use pgwire::api::stmt::QueryParser;
use pgwire::api::stmt::StoredStatement;
use pgwire::api::{ClientInfo, NoopErrorHandler, PgWireServerHandlers, Type};
use pgwire::api::{ClientInfo, PgWireServerHandlers, Type};
use pgwire::error::{PgWireError, PgWireResult};
use tokio::sync::Mutex;

Expand Down Expand Up @@ -50,31 +50,17 @@ impl HandlerFactory {
}

impl PgWireServerHandlers for HandlerFactory {
type StartupHandler = SimpleStartupHandler;
type SimpleQueryHandler = DfSessionService;
type ExtendedQueryHandler = DfSessionService;
type CopyHandler = NoopCopyHandler;
type ErrorHandler = NoopErrorHandler;

fn simple_query_handler(&self) -> Arc<Self::SimpleQueryHandler> {
fn simple_query_handler(&self) -> Arc<impl SimpleQueryHandler> {
self.session_service.clone()
}

fn extended_query_handler(&self) -> Arc<Self::ExtendedQueryHandler> {
fn extended_query_handler(&self) -> Arc<impl ExtendedQueryHandler> {
self.session_service.clone()
}

fn startup_handler(&self) -> Arc<Self::StartupHandler> {
fn startup_handler(&self) -> Arc<impl StartupHandler> {
Arc::new(SimpleStartupHandler)
}

fn copy_handler(&self) -> Arc<Self::CopyHandler> {
Arc::new(NoopCopyHandler)
}

fn error_handler(&self) -> Arc<Self::ErrorHandler> {
Arc::new(NoopErrorHandler)
}
}

pub struct DfSessionService {
Expand Down
Loading