itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-04-08 19:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a Transaction type to simplify dealing with Transactions

Browse Source
This commit is contained in:
Ryan Leckey
2020-01-03 22:42:10 -08:00
parent 28ed854b03
commit b1a27ddac2
10 changed files with 272 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sqlx-core/src/postgres/connection.rs
View File

@@ -8,7 +8,7 @@ use rand::Rng;
use sha2::{Digest, Sha256};
use crate::cache::StatementCache;
use crate::connection::Connection;
use crate::connection::{Connect, Connection};
use crate::io::{Buf, BufStream, MaybeTlsStream};
use crate::postgres::protocol::{
self, hi, Authentication, Decode, Encode, Message, SaslInitialResponse, SaslResponse,
@@ -334,7 +334,7 @@ impl PgConnection {
}
impl PgConnection {
pub(super) async fn open(url: Result<Url>) -> Result<Self> {
pub(super) async fn establish(url: Result<Url>) -> Result<Self> {
let url = url?;
let stream = MaybeTlsStream::connect(&url, 5432).await?;
@@ -402,7 +402,7 @@ impl PgConnection {
T: TryInto<Url, Error = crate::Error>,
Self: Sized,
{
Box::pin(PgConnection::open(url.try_into()))
Box::pin(PgConnection::establish(url.try_into()))
}
}
@@ -414,7 +414,7 @@ impl Connect for PgConnection {
T: TryInto<Url, Error = crate::Error>,
Self: Sized,
{
Box::pin(PgConnection::open(url.try_into()))
Box::pin(PgConnection::establish(url.try_into()))
}
}

13
sqlx-core/src/postgres/mod.rs
View File

@@ -18,16 +18,3 @@ mod types;
/// An alias for [`Pool`], specialized for **Postgres**.
pub type PgPool = super::Pool<Postgres>;
use std::convert::TryInto;
use crate::url::Url;
// used in tests and hidden code in examples
#[doc(hidden)]
pub async fn connect<T>(url: T) -> crate::Result<PgConnection>
where
T: TryInto<Url, Error = crate::Error>,
{
PgConnection::open(url.try_into()).await
}