Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.

Added support for NewType/transparent structs #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
15 changes: 14 additions & 1 deletion src/overrides.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ use syn::{Attribute, Meta, NestedMeta, Lit};

pub struct Overrides {
pub name: Option<String>,
pub transparent: bool,
}

impl Overrides {
pub fn extract(attrs: &[Attribute]) -> Result<Overrides, String> {
let mut overrides = Overrides {
name: None,
transparent: false,
};

for attr in attrs {
Expand Down Expand Up @@ -39,11 +41,22 @@ impl Overrides {

overrides.name = Some(value);
},
_ => return Err("expected a name-value meta item".to_owned()),
NestedMeta::Meta(Meta::Word(ref meta)) => {
if meta.as_ref() == "transparent" {
overrides.transparent = true;
} else {
return Err(format!("unknown override `{}`", meta.as_ref()));
}
}
_ => return Err("expected a name-value or word meta item".to_owned()),
}
}
}

if overrides.name.is_some() && overrides.transparent {
return Err("overrides `name` and `transparent` may not be used at the same time".to_owned())
}

Ok(overrides)
}
}
24 changes: 22 additions & 2 deletions src/tosql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,21 @@ pub fn expand_derive_tosql(input: DeriveInput) -> Result<Tokens, String> {
let overrides = Overrides::extract(&input.attrs)?;

let name = overrides.name.unwrap_or_else(|| input.ident.to_string());
let transparent = overrides.transparent;

let (accepts_body, to_sql_body) = match input.data {
Data::Enum(ref data) => {
let variants = data.variants.iter().map(Variant::parse).collect::<Result<Vec<_>, _>>()?;
(accepts::enum_body(&name, &variants), enum_body(&input.ident, &variants))
}
Data::Struct(DataStruct { fields: Fields::Unnamed(ref fields), .. }) if fields.unnamed.len() == 1 => {
let field = fields.unnamed.first().unwrap().into_value();
(domain_accepts_body(&name, &field), domain_body())
if transparent {
let field = fields.unnamed.first().unwrap().into_value();
(transparent_accepts_body(&field), transparent_body())
} else {
let field = fields.unnamed.first().unwrap().into_value();
(domain_accepts_body(&name, &field), domain_body())
}
}
Data::Struct(DataStruct { fields: Fields::Named(ref fields), .. }) => {
let fields = fields.named.iter().map(Field::parse).collect::<Result<Vec<_>, _>>()?;
Expand Down Expand Up @@ -73,6 +79,20 @@ fn enum_body(ident: &Ident, variants: &[Variant]) -> Tokens {
}
}

fn transparent_accepts_body(field: &syn::Field) -> Tokens {
let ty = &field.ty;

quote! {
<#ty as ::postgres::types::ToSql>::accepts(type_)
}
}

fn transparent_body() -> Tokens {
quote! {
::postgres::types::ToSql::to_sql(&self.0, _type, buf)
}
}

fn domain_accepts_body(name: &str, field: &syn::Field) -> Tokens {
let ty = &field.ty;

Expand Down
49 changes: 49 additions & 0 deletions tests/wrapper.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#[macro_use]
extern crate postgres_derive;
#[macro_use]
extern crate postgres;

use postgres::{Connection, TlsMode};
use postgres::types::WrongType;

mod util;

#[test]
fn transparent() {
#[derive(FromSql, ToSql, Debug, PartialEq)]
#[postgres(transparent)]
struct ResourceId(i32);

let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
.unwrap();

util::test_type(
&conn,
"\"int4\"",
&[
(
ResourceId(123),
"123",
),
(
ResourceId(-27),
"-27",
),
],
);
}

#[test]
fn wrong_type() {
#[derive(FromSql, ToSql, Debug, PartialEq)]
#[postgres(transparent)]
struct ResourceId(i32);

let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
.unwrap();

let err = conn.execute("SELECT $1::date", &[&ResourceId(0)])
.unwrap_err();
assert!(err.as_conversion().unwrap().is::<WrongType>());
}