Commitdd291a4

authored

Merge pull request#1189 from zacknewman/master

fix fromsql for domains

2 parents2ad76a8 +cc17f8e commitdd291a4Copy full SHA for dd291a4

File tree

+37

-1

lines changed

+37

-1

lines changed

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,3 +119,36 @@ fn domain_in_composite() {`
`119`	`119`	`)],`
`120`	`120`	`);`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+#[test]`
	`124`	`+fncomposite_in_domain_in_composite(){`
	`125`	`+#[derive(FromSql,ToSql,Debug,PartialEq)]`
	`126`	`+#[postgres(name ="leaf_composite")]`
	`127`	`+structLeafComposite{`
	`128`	`+prim:i32,`
	`129`	`+}`
	`130`	`+`
	`131`	`+#[derive(FromSql,ToSql,Debug,PartialEq)]`
	`132`	`+#[postgres(name ="domain")]`
	`133`	`+structDomain(LeafComposite);`
	`134`	`+`
	`135`	`+#[derive(FromSql,ToSql,Debug,PartialEq)]`
	`136`	`+#[postgres(name ="root_composite")]`
	`137`	`+structRootComposite{`
	`138`	`+domain:Domain,`
	`139`	`+}`
	`140`	`+`
	`141`	`+letmut conn =Client::connect("user=postgres host=localhost port=5433",NoTls).unwrap();`
	`142`	`+ conn.batch_execute("CREATE TYPE leaf_composite AS (prim integer); CREATE DOMAIN domain AS leaf_composite; CREATE TYPE root_composite AS (domain domain);").unwrap();`
	`143`	`+`
	`144`	`+test_type(`
	`145`	`+&mut conn,`
	`146`	`+"root_composite",`
	`147`	`+&[(`
	`148`	`+RootComposite{`
	`149`	`+domain:Domain(LeafComposite{prim:1}),`
	`150`	`+},`
	`151`	`+"ROW(ROW(1))",`
	`152`	`+)],`
	`153`	`+);`
	`154`	`+}`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,10 @@ fn domain_accepts_body(name: &str, field: &syn::Field) -> TokenStream {`
`179`	`179`	`fndomain_body(ident:&Ident,field:&syn::Field) ->TokenStream{`
`180`	`180`	`let ty =&field.ty;`
`181`	`181`	`quote!{`
`182`		`- <#tyas postgres_types::FromSql>::from_sql(_type, buf).map(#ident)`
	`182`	`+ <#tyas postgres_types::FromSql>::from_sql(match*_type.kind(){`
	`183`	`+ postgres_types::Kind::Domain(ref _type) => _type,`
	`184`	`+ _ => _type`
	`185`	`+}, buf).map(#ident)`
`183`	`186`	`}`
`184`	`187`	`}`
`185`	`188`

Comments

(0)