Commit7d52522

committed

expose sync rollback as a private api method

1 parent490c485 commit7d52522Copy full SHA for 7d52522

File tree

+21

-28

lines changed

+21

-28

lines changed

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-usecrate::codec::BackendMessages;`
	`1`	`+usecrate::codec::{BackendMessages,FrontendMessage};`
`2`	`2`	`usecrate::config::{SslMode,SslNegotiation};`
`3`	`3`	`usecrate::connection::{Request,RequestMessages};`
`4`	`4`	`usecrate::copy_out::CopyOutStream;`
`@@ -22,6 +22,7 @@ use futures_channel::mpsc;`
`22`	`22`	`use futures_util::{future, pin_mut, ready,StreamExt,TryStreamExt};`
`23`	`23`	`use parking_lot::Mutex;`
`24`	`24`	`use postgres_protocol::message::backend::Message;`
	`25`	`+use postgres_protocol::message::frontend;`
`25`	`26`	`use postgres_types::BorrowToSql;`
`26`	`27`	`use std::collections::HashMap;`
`27`	`28`	`use std::fmt;`
`@@ -605,6 +606,21 @@ impl Client {`
`605`	`606`	`pubfn__private_api_close(&mutself){`
`606`	`607`	`self.inner.sender.close_channel()`
`607`	`608`	`}`
	`609`	`+`
	`610`	`+#[doc(hidden)]`
	`611`	`+pubfn__private_api_rollback(&self,name:Option<&str>){`
	`612`	`+let buf =self.inner().with_buf(\|buf\|{`
	`613`	`+ifletSome(name) = name{`
	`614`	`+ frontend::query(&format!("ROLLBACK TO {}", name), buf).unwrap();`
	`615`	`+}else{`
	`616`	`+ frontend::query("ROLLBACK", buf).unwrap();`
	`617`	`+}`
	`618`	`+ buf.split().freeze()`
	`619`	`+});`
	`620`	`+let _ =self`
	`621`	`+.inner()`
	`622`	`+.send(RequestMessages::Single(FrontendMessage::Raw(buf)));`
	`623`	`+}`
`608`	`624`	`}`
`609`	`625`
`610`	`626`	`impl fmt::DebugforClient{`

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-usecrate::codec::FrontendMessage;`
`2`		`-usecrate::connection::RequestMessages;`
`3`	`1`	`usecrate::copy_out::CopyOutStream;`
`4`	`2`	`usecrate::query::RowStream;`
`5`	`3`	`#[cfg(feature ="runtime")]`
`@@ -14,7 +12,6 @@ use crate::{`
`14`	`12`	`};`
`15`	`13`	`use bytes::Buf;`
`16`	`14`	`use futures_util::TryStreamExt;`
`17`		`-use postgres_protocol::message::frontend;`
`18`	`15`	`use tokio::io::{AsyncRead,AsyncWrite};`
`19`	`16`
`20`	`17`	`/// A representation of a PostgreSQL database transaction.`
`@@ -39,19 +36,8 @@ impl Drop for Transaction<'_> {`
`39`	`36`	`return;`
`40`	`37`	`}`
`41`	`38`
`42`		`-let query =ifletSome(sp) =self.savepoint.as_ref(){`
`43`		`-format!("ROLLBACK TO {}", sp.name)`
`44`		`-}else{`
`45`		`-"ROLLBACK".to_string()`
`46`		`-};`
`47`		`-let buf =self.client.inner().with_buf(\|buf\|{`
`48`		`- frontend::query(&query, buf).unwrap();`
`49`		`- buf.split().freeze()`
`50`		`-});`
`51`		`-let _ =self`
`52`		`-.client`
`53`		`-.inner()`
`54`		`-.send(RequestMessages::Single(FrontendMessage::Raw(buf)));`
	`39`	`+let name =self.savepoint.as_ref().map(\|sp\| sp.name.as_str());`
	`40`	`+self.client.__private_api_rollback(name);`
`55`	`41`	`}`
`56`	`42`	`}`
`57`	`43`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-use postgres_protocol::message::frontend;`
`2`		`-`
`3`		`-usecrate::{codec::FrontendMessage, connection::RequestMessages,Client,Error,Transaction};`
	`1`	`+usecrate::{Client,Error,Transaction};`
`4`	`2`
`5`	`3`	`/// The isolation level of a database transaction.`
`6`	`4`	`#[derive(Debug,Copy,Clone)]`
`@@ -119,14 +117,7 @@ impl<'a> TransactionBuilder<'a> {`
`119`	`117`	`return;`
`120`	`118`	`}`
`121`	`119`
`122`		`-let buf =self.client.inner().with_buf(\|buf\|{`
`123`		`- frontend::query("ROLLBACK", buf).unwrap();`
`124`		`- buf.split().freeze()`
`125`		`-});`
`126`		`-let _ =self`
`127`		`-.client`
`128`		`-.inner()`
`129`		`-.send(RequestMessages::Single(FrontendMessage::Raw(buf)));`
	`120`	`+self.client.__private_api_rollback(None);`
`130`	`121`	`}`
`131`	`122`	`}`
`132`	`123`

Comments

(0)