Commit91b2187

authored

Merge pull request#937 from NAlexPear/encode_format_types

Encode Format based on Type

2 parents8f955eb +8158eed commit91b2187Copy full SHA for 91b2187

File tree

+16

-12

lines changed

+16

-12

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,7 @@ pub trait ToSql: fmt::Debug {`
`836`	`836`	`) ->Result<IsNull,Box<dynError +Sync +Send>>;`
`837`	`837`
`838`	`838`	`/// Specify the encode format`
`839`		`-fnencode_format(&self) ->Format{`
	`839`	`+fnencode_format(&self,_ty:&Type) ->Format{`
`840`	`840`	`Format::Binary`
`841`	`841`	`}`
`842`	`842`	`}`
`@@ -868,8 +868,8 @@ where`
`868`	`868`	`T::accepts(ty)`
`869`	`869`	`}`
`870`	`870`
`871`		`-fnencode_format(&self) ->Format{`
`872`		`-(*self).encode_format()`
	`871`	`+fnencode_format(&self,ty:&Type) ->Format{`
	`872`	`+(*self).encode_format(ty)`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`to_sql_checked!();`
`@@ -891,9 +891,9 @@ impl<T: ToSql> ToSql for Option<T> {`
`891`	`891`	`<TasToSql>::accepts(ty)`
`892`	`892`	`}`
`893`	`893`
`894`		`-fnencode_format(&self) ->Format{`
	`894`	`+fnencode_format(&self,ty:&Type) ->Format{`
`895`	`895`	`matchself{`
`896`		`-Some(ref val) => val.encode_format(),`
	`896`	`+Some(ref val) => val.encode_format(ty),`
`897`	`897`	`None =>Format::Binary,`
`898`	`898`	`}`
`899`	`899`	`}`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,25 +156,29 @@ where`
`156`	`156`	`I:IntoIterator<Item =P>,`
`157`	`157`	`I::IntoIter:ExactSizeIterator,`
`158`	`158`	`{`
`159`		`-let(param_formats, params):(Vec<_>,Vec<_>) = params`
`160`		`-.into_iter()`
`161`		`-.map(\|p\|(p.borrow_to_sql().encode_format()asi16, p))`
`162`		`-.unzip();`
	`159`	`+let param_types = statement.params();`
`163`	`160`	`let params = params.into_iter();`
`164`	`161`
`165`	`162`	`assert!(`
`166`		`-statement.params().len() == params.len(),`
	`163`	`+param_types.len() == params.len(),`
`167`	`164`	`"expected {} parameters but got {}",`
`168`		`-statement.params().len(),`
	`165`	`+param_types.len(),`
`169`	`166`	`params.len()`
`170`	`167`	`);`
`171`	`168`
	`169`	`+let(param_formats, params):(Vec<_>,Vec<_>) = params`
	`170`	`+.zip(param_types.iter())`
	`171`	`+.map(\|(p, ty)\|(p.borrow_to_sql().encode_format(ty)asi16, p))`
	`172`	`+.unzip();`
	`173`	`+`
	`174`	`+let params = params.into_iter();`
	`175`	`+`
`172`	`176`	`letmut error_idx =0;`
`173`	`177`	`let r = frontend::bind(`
`174`	`178`	`portal,`
`175`	`179`	`statement.name(),`
`176`	`180`	`param_formats,`
`177`		`- params.zip(statement.params()).enumerate(),`
	`181`	`+ params.zip(param_types).enumerate(),`
`178`	`182`	`\|(idx,(param, ty)), buf\|match param.borrow_to_sql().to_sql_checked(ty, buf){`
`179`	`183`	`Ok(IsNull::No) =>Ok(postgres_protocol::IsNull::No),`
`180`	`184`	`Ok(IsNull::Yes) =>Ok(postgres_protocol::IsNull::Yes),`

Comments

(0)