Commit09e8656

authored

Merge pull request#836 from subzerocloud/master

Implement Unknown encoding for query parameters

2 parents8736f45 +6838688 commit09e8656Copy full SHA for 09e8656

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -834,8 +834,32 @@ pub trait ToSql: fmt::Debug {`
`834`	`834`	`ty:&Type,`
`835`	`835`	`out:&mutBytesMut,`
`836`	`836`	`) ->Result<IsNull,Box<dynError +Sync +Send>>;`
	`837`	`+`
	`838`	`+/// Specify the encode format`
	`839`	`+fnencode_format(&self) ->Format{Format::Binary}`
`837`	`840`	`}`
`838`	`841`
	`842`	`+/// Supported Postgres message format types`
	`843`	`+///`
	`844`	+/// Using Text format in a message assumes a Postgres `SERVER_ENCODING` of `UTF8`
	`845`	`+pubenumFormat{`
	`846`	`+/// Text format (UTF-8)`
	`847`	`+Text,`
	`848`	`+/// Compact, typed binary format`
	`849`	`+Binary,`
	`850`	`+}`
	`851`	`+`
	`852`	+/// Convert from `Format` to the Postgres integer representation of those formats
	`853`	`+implFrom<Format>fori16{`
	`854`	`+fnfrom(format:Format) ->Self{`
	`855`	`+match format{`
	`856`	`+Format::Text =>0,`
	`857`	`+Format::Binary =>1,`
	`858`	`+}`
	`859`	`+}`
	`860`	`+}`
	`861`	`+`
	`862`	`+`
`839`	`863`	`impl<'a,T>ToSqlfor&'aT`
`840`	`864`	`where`
`841`	`865`	`T:ToSql,`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ where`
`156`	`156`	`I:IntoIterator<Item =P>,`
`157`	`157`	`I::IntoIter:ExactSizeIterator,`
`158`	`158`	`{`
	`159`	`+let(param_formats, params):(Vec<_>,Vec<_>) = params.into_iter().map(\|p\|->(i16,P){(p.borrow_to_sql().encode_format().into(),p)}).unzip();`
`159`	`160`	`let params = params.into_iter();`
`160`	`161`
`161`	`162`	`assert!(`
`@@ -169,7 +170,7 @@ where`
`169`	`170`	`let r = frontend::bind(`
`170`	`171`	`portal,`
`171`	`172`	`statement.name(),`
`172`		`-Some(1),`
	`173`	`+param_formats,`
`173`	`174`	`params.zip(statement.params()).enumerate(),`
`174`	`175`	`\|(idx,(param, ty)), buf\|match param.borrow_to_sql().to_sql_checked(ty, buf){`
`175`	`176`	`Ok(IsNull::No) =>Ok(postgres_protocol::IsNull::No),`

Comments

(0)