From 488d34790f8b8e8d61dafabe23364d996fccd4ff Mon Sep 17 00:00:00 2001 From: Marcelo Altmann Date: Thu, 12 Feb 2026 12:54:39 -0300 Subject: [PATCH] Update mysql_common to v0.36.2 Replace deprecated `into_positional` with `into_values` and add `From` impl for the new error type. --- Cargo.toml | 2 +- src/conn/routines/exec.rs | 3 ++- src/error/mod.rs | 16 ++++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 609f8f38..9e40eefa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ futures-util = "0.3" futures-sink = "0.3" keyed_priority_queue = "0.4" lru = "0.16.0" -mysql_common = { version = "0.35.4", default-features = false } +mysql_common = { version = "0.36.2", default-features = false } pem = "3.0" percent-encoding = "2.1.0" rand = "0.9" diff --git a/src/conn/routines/exec.rs b/src/conn/routines/exec.rs index 30b24286..7284bf27 100644 --- a/src/conn/routines/exec.rs +++ b/src/conn/routines/exec.rs @@ -83,7 +83,8 @@ impl Routine<()> for ExecRoutine<'_> { } let named = mem::replace(&mut self.params, Params::Empty); - self.params = named.into_positional(&self.stmt.named_params)?; + self.params = + Params::Positional(named.into_values(Some(&self.stmt.named_params))?); continue; } diff --git a/src/error/mod.rs b/src/error/mod.rs index 5ff44384..343d2597 100644 --- a/src/error/mod.rs +++ b/src/error/mod.rs @@ -11,8 +11,11 @@ pub use url::ParseError; pub mod tls; use mysql_common::{ - named_params::MixedParamsError, params::MissingNamedParameterError, - proto::codec::error::PacketCodecError, row::Row, value::Value, + named_params::MixedParamsError, + params::{MissingNamedParameterError, ParamsError}, + proto::codec::error::PacketCodecError, + row::Row, + value::Value, }; use thiserror::Error; @@ -299,6 +302,15 @@ impl From for Error { } } +impl From for Error { + fn from(err: ParamsError) -> Self { + match err { + ParamsError::Missing(e) => e.into(), + ParamsError::Confusion(_) => Error::Driver(DriverError::NamedParamsForPositionalQuery), + } + } +} + impl From for UrlError { fn from(err: ParseError) -> Self { UrlError::Parse(err)