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
4 changes: 2 additions & 2 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 @@ -18,7 +18,7 @@ bytes = "1.11.0"
chrono = { version = "0.4", features = ["std"] }
datafusion = { version = "50", default-features = false }
futures = "0.3"
pgwire = { version = "0.35", default-features = false }
pgwire = { version = "0.36.1", default-features = false }
postgres-types = "0.2"
rust_decimal = { version = "1.39", features = ["db-postgres"] }
tokio = { version = "1", default-features = false }
Expand Down
18 changes: 13 additions & 5 deletions arrow-pg/src/datatypes/df.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ where
S: Clone,
{
fn get_pg_type(
pg_type_hint: Option<&Type>,
pg_type_hint: Option<Type>,
inferenced_type: Option<&DataType>,
) -> PgWireResult<Type> {
if let Some(ty) = pg_type_hint {
Expand All @@ -80,7 +80,14 @@ where
let mut deserialized_params = Vec::with_capacity(param_len);
for i in 0..param_len {
let inferenced_type = inferenced_types.get(i).and_then(|v| v.to_owned());
let pg_type = get_pg_type(portal.statement.parameter_types.get(i), inferenced_type)?;
let pg_type = get_pg_type(
portal
.statement
.parameter_types
.get(i)
.and_then(|f| f.clone()),
inferenced_type,
)?;
match pg_type {
// enumerate all supported parameter types and deserialize the
// type to ScalarValue
Expand Down Expand Up @@ -156,6 +163,7 @@ where
}
Type::TIME => {
let value = portal.parameter::<NaiveTime>(i, &pg_type)?;
dbg!(&value);

let ns = value.map(|t| {
t.num_seconds_from_midnight() as i64 * 1_000_000_000 + t.nanosecond() as i64
Expand Down Expand Up @@ -329,22 +337,22 @@ mod tests {
use datafusion::{common::ParamValues, scalar::ScalarValue};
use pgwire::{
api::{portal::Portal, stmt::StoredStatement},
messages::extendedquery::Bind,
messages::{data::FORMAT_CODE_BINARY, extendedquery::Bind},
};
use postgres_types::Type;

use crate::datatypes::df::deserialize_parameters;

#[test]
fn test_deserialise_time_params() {
let postgres_types = vec![Type::TIME];
let postgres_types = vec![Some(Type::TIME)];

let us: i64 = 1_000_000; // 1 second

let bind = Bind::new(
None,
None,
vec![],
vec![FORMAT_CODE_BINARY],
vec![Some(Bytes::from(i64::to_be_bytes(us).to_vec()))],
vec![],
);
Expand Down
2 changes: 1 addition & 1 deletion datafusion-postgres/src/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ impl QueryParser for Parser {
&self,
client: &C,
sql: &str,
_types: &[Type],
_types: &[Option<Type>],
) -> PgWireResult<Self::Statement>
where
C: ClientInfo + Unpin + Send + Sync,
Expand Down
Loading