From b002a4f27c744fc893258686f1752e47b6104370 Mon Sep 17 00:00:00 2001 From: Konrad Kohbrok Date: Tue, 26 Mar 2024 09:27:31 -0400 Subject: [PATCH] fix rusqlite feature --- types/Cargo.toml | 2 +- types/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types/Cargo.toml b/types/Cargo.toml index dbcd913..d210de3 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } uuid = { version = "1", features = ["serde", "v4"] } thiserror = "1.0" openmls = { git = "https://github.com/openmls/openmls" } -rusqlite = { version = "0.31", optional = true } +rusqlite = { version = "0.31", features = ["uuid"], optional = true } [features] rusqlite = ["dep:rusqlite"] diff --git a/types/src/lib.rs b/types/src/lib.rs index a46e7b5..57385c6 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -131,7 +131,7 @@ impl TryFrom<&[u8]> for DsClientId { impl ToSql for DsClientId { fn to_sql(&self) -> rusqlite::Result> { Ok(rusqlite::types::ToSqlOutput::Borrowed( - rusqlite::types::ValueRef::Blob(self.id.as_bytes()), + rusqlite::types::ValueRef::Blob(self.id.as_slice()), )) } } @@ -139,8 +139,8 @@ impl ToSql for DsClientId { #[cfg(feature = "rusqlite")] impl FromSql for DsClientId { fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult { - let uuid = Uuid::column_result(value)?; - Ok(uuid.into()) + let id = <[u8; 32]>::column_result(value)?; + Ok(Self { id }) } }