Implement Value for Vec<u8> and String

- Allow Vec<u8>, String, Cow<'a, str>, Cow<'a, [u8]> to be used as value types
bluk · Sep 7, 2023 · 5643176 · 5643176
1 parent 7ec1b85
commit 5643176
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -624,7 +624,7 @@ mod tests {
     }
 
     #[test]
-    fn query_only_one_edb() -> Result<()> {
+    fn query_exclusive_edb() -> Result<()> {
         let mut data = Passdata::with_schema(&QUERY_ONLY_ONE_EDB_SCHEMA);
 
         data.add_fact("a", true)?;
@@ -654,6 +654,18 @@ mod tests {
         assert_eq!(data.query_exclusive_edb::<_, i64>("c", 5678), Ok(None));
 
         assert_eq!(data.query_exclusive_edb("d", AnyStr), Ok(Some("xyz")));
+        assert_eq!(
+            data.query_exclusive_edb("d", AnyStr),
+            Ok(Some(String::from("xyz")))
+        );
+        assert_eq!(
+            data.query_exclusive_edb("d", AnyStr),
+            Ok(Some("xyz".as_bytes()))
+        );
+        assert_eq!(
+            data.query_exclusive_edb("d", AnyStr),
+            Ok(Some("xyz".as_bytes().to_vec()))
+        );
         assert_eq!(
             data.query_exclusive_edb("d", AnyBytes),
             Ok(Some("xyz".as_bytes()))

diff --git a/src/utils.rs b/src/utils.rs
@@ -514,12 +514,36 @@ impl<'a> Value for &'a [u8] {
     }
 }
 
+impl Value for Vec<u8> {
+    fn supported_ty() -> ExpectedConstantTy {
+        ExpectedConstantTy::Bytes
+    }
+}
+
+impl<'a> Value for Cow<'a, [u8]> {
+    fn supported_ty() -> ExpectedConstantTy {
+        ExpectedConstantTy::Bytes
+    }
+}
+
 impl<'a> Value for &'a str {
     fn supported_ty() -> ExpectedConstantTy {
         ExpectedConstantTy::Bytes
     }
 }
 
+impl Value for String {
+    fn supported_ty() -> ExpectedConstantTy {
+        ExpectedConstantTy::Bytes
+    }
+}
+
+impl<'a> Value for Cow<'a, str> {
+    fn supported_ty() -> ExpectedConstantTy {
+        ExpectedConstantTy::Bytes
+    }
+}
+
 impl<'a> Value for values::Constant<'a> {
     fn supported_ty() -> ExpectedConstantTy {
         ExpectedConstantTy::Any

diff --git a/src/values.rs b/src/values.rs
@@ -34,10 +34,10 @@
 //! absolute limit to the amount of data that can be encoded.
 
 #[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::borrow::Cow;
+use alloc::{borrow::Cow, string::String, vec::Vec};
 use core::fmt;
 #[cfg(feature = "std")]
-use std::{borrow::Cow, error};
+use std::{borrow::Cow, error, string::String, vec::Vec};
 
 use crate::{
     error::{Error, ErrorKind},
@@ -188,6 +188,17 @@ impl<'a> TryFrom<Constant<'a>> for &'a [u8] {
     }
 }
 
+impl<'a> TryFrom<Constant<'a>> for Vec<u8> {
+    type Error = InvalidType;
+
+    fn try_from(value: Constant<'a>) -> Result<Self, Self::Error> {
+        match value {
+            Constant::Bool(_) | Constant::Num(_) => Err(InvalidType),
+            Constant::Bytes(bytes) => Ok(bytes.to_vec()),
+        }
+    }
+}
+
 impl<'a> TryFrom<Constant<'a>> for Cow<'a, [u8]> {
     type Error = InvalidType;
 
@@ -210,6 +221,19 @@ impl<'a> TryFrom<Constant<'a>> for &'a str {
     }
 }
 
+impl<'a> TryFrom<Constant<'a>> for String {
+    type Error = InvalidType;
+
+    fn try_from(value: Constant<'a>) -> Result<Self, Self::Error> {
+        match value {
+            Constant::Bool(_) | Constant::Num(_) => Err(InvalidType),
+            Constant::Bytes(bytes) => {
+                Ok(String::from_utf8(bytes.to_vec()).map_err(|_| InvalidType)?)
+            }
+        }
+    }
+}
+
 impl<'a> TryFrom<Constant<'a>> for Cow<'a, str> {
     type Error = InvalidType;