Skip to content
Open
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
42 changes: 34 additions & 8 deletions src/sql/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::fmt::{self, Write};

use serde::{
Serialize,
ser::{self, SerializeSeq, SerializeTuple, Serializer},
ser::{self, SerializeSeq, SerializeTuple, SerializeTupleStruct, Serializer},
};
use thiserror::Error;

Expand Down Expand Up @@ -80,7 +80,7 @@ impl<'a, W: Write> Serializer for SqlSerializer<'a, W> {
type SerializeStruct = Impossible;
type SerializeStructVariant = Impossible;
type SerializeTuple = SqlListSerializer<'a, W>;
type SerializeTupleStruct = Impossible;
type SerializeTupleStruct = SqlListSerializer<'a, W>;
type SerializeTupleVariant = Impossible;

unsupported!(
Expand Down Expand Up @@ -196,8 +196,13 @@ impl<'a, W: Write> Serializer for SqlSerializer<'a, W> {
}

#[inline]
fn serialize_tuple_struct(self, _name: &'static str, _len: usize) -> Result<Impossible> {
Err(SerializerError::Unsupported("serialize_tuple_struct"))
fn serialize_tuple_struct(self, _name: &'static str, _len: usize) -> Result<SqlListSerializer<'a, W>> {
self.writer.write_char('(')?;
Ok(SqlListSerializer {
writer: self.writer,
has_items: false,
closing_char: ')',
})
}

#[inline]
Expand Down Expand Up @@ -286,6 +291,24 @@ impl<W: Write> SerializeTuple for SqlListSerializer<'_, W> {
}
}

impl<W: Write> SerializeTupleStruct for SqlListSerializer<'_, W> {
type Error = SerializerError;
type Ok = ();

#[inline]
fn serialize_field<T>(&mut self, value: &T) -> Result
where
T: Serialize + ?Sized,
{
SerializeSeq::serialize_element(self, value)
}

#[inline]
fn end(self) -> Result {
SerializeSeq::end(self)
}
}

// === ParamSerializer ===

struct ParamSerializer<'a, W> {
Expand Down Expand Up @@ -543,6 +566,13 @@ mod tests {
assert_eq!(check((42, 43)), "(42,43)");
}

#[test]
fn it_writes_tuple_structs() {
#[derive(Serialize)]
struct T(u32, u32);
assert_eq!(check(T(42, 43)), "(42,43)");
}

#[test]
fn it_writes_options() {
assert_eq!(check(None::<i32>), "NULL");
Expand All @@ -566,10 +596,6 @@ mod tests {
}
assert!(write_arg(&mut out, &Struct { a: 42 }).is_err());

#[derive(Serialize)]
struct TupleStruct(u32, u32);
assert!(write_arg(&mut out, &TupleStruct(42, 42)).is_err());

#[derive(Serialize)]
enum Enum {
Newtype(u32),
Expand Down