Skip to content

Commit b704db0

Browse files
committed
feat: update pgwire to 0.33
1 parent 72851de commit b704db0

File tree

7 files changed

+26
-48
lines changed

7 files changed

+26
-48
lines changed

Cargo.lock

Lines changed: 10 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
@@ -19,7 +19,7 @@ bytes = "1.10.1"
1919
chrono = { version = "0.4", features = ["std"] }
2020
datafusion = { version = "50", default-features = false }
2121
futures = "0.3"
22-
pgwire = { version = "0.32", default-features = false }
22+
pgwire = { version = "0.33", default-features = false }
2323
postgres-types = "0.2"
2424
rust_decimal = { version = "1.38", features = ["db-postgres"] }
2525
tokio = { version = "1", default-features = false }

arrow-pg/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ bytes.workspace = true
2323
chrono.workspace = true
2424
datafusion = { workspace = true, optional = true }
2525
futures.workspace = true
26-
pgwire = { version = ">=0.32", default-features = false, features = ["server-api"] }
26+
pgwire = { version = ">=0.33", default-features = false, features = ["server-api"] }
2727
postgres-types.workspace = true
2828
rust_decimal.workspace = true

arrow-pg/src/datatypes/df.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ use rust_decimal::Decimal;
1818

1919
use super::{arrow_schema_to_pg_fields, encode_recordbatch, into_pg_type};
2020

21-
pub async fn encode_dataframe<'a>(
22-
df: DataFrame,
23-
format: &Format,
24-
) -> PgWireResult<QueryResponse<'a>> {
21+
pub async fn encode_dataframe(df: DataFrame, format: &Format) -> PgWireResult<QueryResponse> {
2522
let fields = Arc::new(arrow_schema_to_pg_fields(df.schema().as_arrow(), format)?);
2623

2724
let recordbatch_stream = df

datafusion-postgres/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ datafusion.workspace = true
2727
futures.workspace = true
2828
getset = "0.1"
2929
log = "0.4"
30-
pgwire = { workspace = true, features = ["server-api-ring", "scram"] }
30+
pgwire = { workspace = true, features = ["server-api-ring"] }
3131
postgres-types.workspace = true
3232
rust_decimal.workspace = true
3333
tokio = { version = "1.47", features = ["sync", "net"] }

datafusion-postgres/src/auth.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ impl AuthManager {
545545

546546
/// AuthSource implementation for integration with pgwire authentication
547547
/// Provides proper password-based authentication instead of custom startup handler
548-
#[derive(Clone)]
548+
#[derive(Clone, Debug)]
549549
pub struct DfAuthSource {
550550
pub auth_manager: Arc<AuthManager>,
551551
}
@@ -635,6 +635,7 @@ impl AuthSource for DfAuthSource {
635635
// ```
636636

637637
/// Simple AuthSource implementation that accepts any user with empty password
638+
#[derive(Debug)]
638639
pub struct SimpleAuthSource {
639640
auth_manager: Arc<AuthManager>,
640641
}

datafusion-postgres/src/handlers.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl DfSessionService {
208208
ResourceType::All
209209
}
210210

211-
fn mock_show_response<'a>(name: &str, value: &str) -> PgWireResult<QueryResponse<'a>> {
211+
fn mock_show_response(name: &str, value: &str) -> PgWireResult<QueryResponse> {
212212
let fields = vec![FieldInfo::new(
213213
name.to_string(),
214214
None,
@@ -227,11 +227,11 @@ impl DfSessionService {
227227
Ok(QueryResponse::new(Arc::new(fields), Box::pin(row_stream)))
228228
}
229229

230-
async fn try_respond_set_statements<'a, C>(
230+
async fn try_respond_set_statements<C>(
231231
&self,
232232
client: &mut C,
233233
query_lower: &str,
234-
) -> PgWireResult<Option<Response<'a>>>
234+
) -> PgWireResult<Option<Response>>
235235
where
236236
C: ClientInfo,
237237
{
@@ -309,11 +309,11 @@ impl DfSessionService {
309309
}
310310
}
311311

312-
async fn try_respond_transaction_statements<'a, C>(
312+
async fn try_respond_transaction_statements<C>(
313313
&self,
314314
client: &C,
315315
query_lower: &str,
316-
) -> PgWireResult<Option<Response<'a>>>
316+
) -> PgWireResult<Option<Response>>
317317
where
318318
C: ClientInfo,
319319
{
@@ -360,11 +360,11 @@ impl DfSessionService {
360360
}
361361
}
362362

363-
async fn try_respond_show_statements<'a, C>(
363+
async fn try_respond_show_statements<C>(
364364
&self,
365365
client: &C,
366366
query_lower: &str,
367-
) -> PgWireResult<Option<Response<'a>>>
367+
) -> PgWireResult<Option<Response>>
368368
where
369369
C: ClientInfo,
370370
{
@@ -422,7 +422,7 @@ impl DfSessionService {
422422

423423
#[async_trait]
424424
impl SimpleQueryHandler for DfSessionService {
425-
async fn do_query<'a, C>(&self, client: &mut C, query: &str) -> PgWireResult<Vec<Response<'a>>>
425+
async fn do_query<C>(&self, client: &mut C, query: &str) -> PgWireResult<Vec<Response>>
426426
where
427427
C: ClientInfo + Unpin + Send + Sync,
428428
{
@@ -598,12 +598,12 @@ impl ExtendedQueryHandler for DfSessionService {
598598
Ok(DescribePortalResponse::new(fields))
599599
}
600600

601-
async fn do_query<'a, C>(
601+
async fn do_query<C>(
602602
&self,
603603
client: &mut C,
604604
portal: &Portal<Self::Statement>,
605605
_max_rows: usize,
606-
) -> PgWireResult<Response<'a>>
606+
) -> PgWireResult<Response>
607607
where
608608
C: ClientInfo + Unpin + Send + Sync,
609609
{

0 commit comments

Comments
 (0)