Commit6cd4652

committed

Add RowDescription to SimpleQueryMessage

1 parent98f5a11 commit6cd4652Copy full SHA for 6cd4652

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,10 @@`
`118`	`118`	//! \| `with-time-0_3` \| Enable support for the 0.3 version of the `time` crate. \| [time](https://crates.io/crates/time/0.3.0) 0.3 \| no \|
`119`	`119`	`#![warn(rust_2018_idioms, clippy::all, missing_docs)]`
`120`	`120`
	`121`	`+use std::sync::Arc;`
	`122`	`+`
	`123`	`+use simple_query::SimpleColumn;`
	`124`	`+`
`121`	`125`	`pubusecrate::cancel_token::CancelToken;`
`122`	`126`	`pubusecrate::client::Client;`
`123`	`127`	`pubusecrate::config::Config;`
`@@ -248,6 +252,8 @@ pub enum SimpleQueryMessage {`
`248`	`252`	`///`
`249`	`253`	`/// The number of rows modified or selected is returned.`
`250`	`254`	`CommandComplete(u64),`
	`255`	`+/// Column values of the proceeding row values`
	`256`	`+RowDescription(Arc<[SimpleColumn]>)`
`251`	`257`	`}`
`252`	`258`
`253`	`259`	`fnslice_iter<'a>(`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,15 @@ impl Stream for SimpleQueryStream {`
`95`	`95`	`returnPoll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(0))));`
`96`	`96`	`}`
`97`	`97`	`Message::RowDescription(body) =>{`
`98`		`-let columns = body`
	`98`	`+let columns:Arc<[SimpleColumn]> = body`
`99`	`99`	`.fields()`
`100`	`100`	`.map(\|f\|Ok(SimpleColumn::new(f.name().to_string())))`
`101`	`101`	`.collect::<Vec<_>>()`
`102`	`102`	`.map_err(Error::parse)?`
`103`	`103`	`.into();`
`104`	`104`
`105`		`-*this.columns =Some(columns);`
	`105`	`+*this.columns =Some(columns.clone());`
	`106`	`+returnPoll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns.clone()))));`
`106`	`107`	`}`
`107`	`108`	`Message::DataRow(body) =>{`
`108`	`109`	`let row =match&this.columns{`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,13 @@ async fn simple_query() {`
`328`	`328`	`_ =>panic!("unexpected message"),`
`329`	`329`	`}`
`330`	`330`	`match&messages[2]{`
	`331`	`+SimpleQueryMessage::RowDescription(columns) =>{`
	`332`	`+assert_eq!(columns.get(0).map(\|c\| c.name()),Some("id"));`
	`333`	`+assert_eq!(columns.get(1).map(\|c\| c.name()),Some("name"));`
	`334`	`+}`
	`335`	`+ _ =>panic!("unexpected message")`
	`336`	`+}`
	`337`	`+match&messages[3]{`
`331`	`338`	`SimpleQueryMessage::Row(row) =>{`
`332`	`339`	`assert_eq!(row.columns().get(0).map(\|c\| c.name()),Some("id"));`
`333`	`340`	`assert_eq!(row.columns().get(1).map(\|c\| c.name()),Some("name"));`
`@@ -336,7 +343,7 @@ async fn simple_query() {`
`336`	`343`	`}`
`337`	`344`	`_ =>panic!("unexpected message"),`
`338`	`345`	`}`
`339`		`-match&messages[3]{`
	`346`	`+match&messages[4]{`
`340`	`347`	`SimpleQueryMessage::Row(row) =>{`
`341`	`348`	`assert_eq!(row.columns().get(0).map(\|c\| c.name()),Some("id"));`
`342`	`349`	`assert_eq!(row.columns().get(1).map(\|c\| c.name()),Some("name"));`
`@@ -345,11 +352,11 @@ async fn simple_query() {`
`345`	`352`	`}`
`346`	`353`	`_ =>panic!("unexpected message"),`
`347`	`354`	`}`
`348`		`-match messages[4]{`
	`355`	`+match messages[5]{`
`349`	`356`	`SimpleQueryMessage::CommandComplete(2) =>{}`
`350`	`357`	`_ =>panic!("unexpected message"),`
`351`	`358`	`}`
`352`		`-assert_eq!(messages.len(),5);`
	`359`	`+assert_eq!(messages.len(),6);`
`353`	`360`	`}`
`354`	`361`
`355`	`362`	`#[tokio::test]`

Comments

(0)