Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

expose sync rollback as a private api method#1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
paolobarbolini merged 2 commits intorust-postgres:masterfromfredr:sync-rollback
Sep 22, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletiontokio-postgres/src/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use crate::codec::BackendMessages;
use crate::codec::{BackendMessages, FrontendMessage};
use crate::config::{SslMode, SslNegotiation};
use crate::connection::{Request, RequestMessages};
use crate::copy_out::CopyOutStream;
Expand All@@ -22,6 +22,7 @@ use futures_channel::mpsc;
use futures_util::{future, pin_mut, ready, StreamExt, TryStreamExt};
use parking_lot::Mutex;
use postgres_protocol::message::backend::Message;
use postgres_protocol::message::frontend;
use postgres_types::BorrowToSql;
use std::collections::HashMap;
use std::fmt;
Expand DownExpand Up@@ -601,6 +602,21 @@ impl Client {
self.inner.sender.is_closed()
}

#[doc(hidden)]
pub fn __private_api_rollback(&self, name: Option<&str>) {
let buf = self.inner().with_buf(|buf| {
if let Some(name) = name {
frontend::query(&format!("ROLLBACK TO {}", name), buf).unwrap();
} else {
frontend::query("ROLLBACK", buf).unwrap();
}
buf.split().freeze()
});
let _ = self
.inner()
.send(RequestMessages::Single(FrontendMessage::Raw(buf)));
}

#[doc(hidden)]
pub fn __private_api_close(&mut self) {
self.inner.sender.close_channel()
Expand Down
18 changes: 2 additions & 16 deletionstokio-postgres/src/transaction.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
use crate::codec::FrontendMessage;
use crate::connection::RequestMessages;
use crate::copy_out::CopyOutStream;
use crate::query::RowStream;
#[cfg(feature = "runtime")]
Expand All@@ -14,7 +12,6 @@ use crate::{
};
use bytes::Buf;
use futures_util::TryStreamExt;
use postgres_protocol::message::frontend;
use tokio::io::{AsyncRead, AsyncWrite};

/// A representation of a PostgreSQL database transaction.
Expand All@@ -39,19 +36,8 @@ impl Drop for Transaction<'_> {
return;
}

let query = if let Some(sp) = self.savepoint.as_ref() {
format!("ROLLBACK TO {}", sp.name)
} else {
"ROLLBACK".to_string()
};
let buf = self.client.inner().with_buf(|buf| {
frontend::query(&query, buf).unwrap();
buf.split().freeze()
});
let _ = self
.client
.inner()
.send(RequestMessages::Single(FrontendMessage::Raw(buf)));
let name = self.savepoint.as_ref().map(|sp| sp.name.as_str());
self.client.__private_api_rollback(name);
}
}

Expand Down
13 changes: 2 additions & 11 deletionstokio-postgres/src/transaction_builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
use postgres_protocol::message::frontend;

use crate::{codec::FrontendMessage, connection::RequestMessages, Client, Error, Transaction};
use crate::{Client, Error, Transaction};

/// The isolation level of a database transaction.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -119,14 +117,7 @@ impl<'a> TransactionBuilder<'a> {
return;
}

let buf = self.client.inner().with_buf(|buf| {
frontend::query("ROLLBACK", buf).unwrap();
buf.split().freeze()
});
let _ = self
.client
.inner()
.send(RequestMessages::Single(FrontendMessage::Raw(buf)));
self.client.__private_api_rollback(None);
}
}

Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp