Skip to content
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.

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

fix(bind): allow serialization of Some(_) and None values (as the inner value and NULL respectively) #120

Merged
merged 3 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
21 changes: 14 additions & 7 deletions src/sql/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,27 @@ mod tests {
);
}

#[test]
fn option_as_null() {
let mut sql = SqlBuilder::new("SELECT 1 FROM test WHERE a = ?");
loyd marked this conversation as resolved.
Show resolved Hide resolved
sql.bind_arg(None::<u32>);
assert_eq!(sql.finish().unwrap(), r"SELECT 1 FROM test WHERE a = NULL");
}

#[test]
fn option_as_value() {
let mut sql = SqlBuilder::new("SELECT 1 FROM test WHERE a = ?");
sql.bind_arg(Some(1u32));
assert_eq!(sql.finish().unwrap(), r"SELECT 1 FROM test WHERE a = 1");
}

#[test]
fn failures() {
let mut sql = SqlBuilder::new("SELECT 1");
sql.bind_arg(42);
let err = sql.finish().unwrap_err();
assert!(err.to_string().contains("all arguments are already bound"));

let mut sql = SqlBuilder::new("SELECT ?");
sql.bind_arg(None::<u32>);
let err = sql.finish().unwrap_err();
assert!(err
.to_string()
.contains("invalid argument: serialize_none is unsupported"));

let mut sql = SqlBuilder::new("SELECT ?fields");
sql.bind_fields::<Unnamed>();
let err = sql.finish().unwrap_err();
Expand Down
13 changes: 9 additions & 4 deletions src/sql/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ impl<'a, W: Write> Serializer for SqlSerializer<'a, W> {
unsupported!(
serialize_map(Option<usize>) -> Result<Impossible>,
serialize_bytes(&[u8]),
serialize_none,
serialize_unit,
serialize_unit_struct(&'static str),
);
Expand Down Expand Up @@ -141,7 +140,13 @@ impl<'a, W: Write> Serializer for SqlSerializer<'a, W> {

#[inline]
fn serialize_some<T: Serialize + ?Sized>(self, _value: &T) -> Result {
Err(SqlSerializerError::Unsupported("serialize_some"))
_value.serialize(self)
}

#[inline]
fn serialize_none(self) -> std::result::Result<Self::Ok, Self::Error> {
self.writer.write_str("NULL")?;
Ok(())
}

#[inline]
Expand Down Expand Up @@ -340,8 +345,8 @@ mod tests {
fn it_fails_on_unsupported() {
let mut out = String::new();
assert!(write_arg(&mut out, &std::collections::HashMap::<u32, u32>::new()).is_err());
assert!(write_arg(&mut out, &None::<u32>).is_err());
assert!(write_arg(&mut out, &Some(42)).is_err());
assert!(write_arg(&mut out, &None::<u32>).is_ok());
assert!(write_arg(&mut out, &Some(42)).is_ok());
v3xro marked this conversation as resolved.
Show resolved Hide resolved
assert!(write_arg(&mut out, &()).is_err());

#[derive(Serialize)]
Expand Down