Skip to content

Fix parameter type ordering #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Fix parameter type ordering #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37240c
Fix parameter type ordering
mjgarton Jan 29, 2025
c38d526
Make clippy happy
mjgarton Jan 29, 2025
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
29 changes: 18 additions & 11 deletions datafusion-postgres/src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::collections::HashMap;
use std::sync::Arc;

use async_trait::async_trait;
Expand Down Expand Up @@ -138,9 +139,9 @@ impl ExtendedQueryHandler for DfSessionService {
.map_err(|e| PgWireError::ApiError(Box::new(e)))?;

let mut param_types = Vec::with_capacity(params.len());
for param_type in params.into_values() {
for param_type in ordered_param_types(&params).iter() {
if let Some(datatype) = param_type {
let pgtype = into_pg_type(&datatype)?;
let pgtype = into_pg_type(datatype)?;
param_types.push(pgtype);
} else {
param_types.push(Type::UNKNOWN);
Expand Down Expand Up @@ -177,15 +178,12 @@ impl ExtendedQueryHandler for DfSessionService {
{
let plan = &portal.statement.statement;

let param_values = datatypes::deserialize_parameters(
portal,
&plan
.get_parameter_types()
.map_err(|e| PgWireError::ApiError(Box::new(e)))?
.values()
.map(|v| v.as_ref())
.collect::<Vec<Option<&DataType>>>(),
)?;
let param_types = plan
.get_parameter_types()
.map_err(|e| PgWireError::ApiError(Box::new(e)))?;

let param_values =
datatypes::deserialize_parameters(portal, &ordered_param_types(&param_types))?;

let plan = plan
.clone()
Expand All @@ -202,3 +200,12 @@ impl ExtendedQueryHandler for DfSessionService {
Ok(Response::Query(resp))
}
}

fn ordered_param_types(types: &HashMap<String, Option<DataType>>) -> Vec<Option<&DataType>> {
// Datafusion stores the parameters as a map. In our case, the keys will be
// `$1`, `$2` etc. The values will be the parameter types.

let mut types = types.iter().collect::<Vec<_>>();
types.sort_by(|a, b| a.0.cmp(b.0));
types.into_iter().map(|pt| pt.1.as_ref()).collect()
}
Loading