Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

fix: make the order of commands the same as with node-pg #9

Merged
merged 1 commit into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 6 additions & 6 deletions tokio-postgres/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ where
let params = params.into_iter();

let buf = client.with_buf(|buf| {
// prepare
// Prepare
frontend::parse("", query, std::iter::empty(), buf).map_err(Error::encode)?;
frontend::describe(b'S', "", buf).map_err(Error::encode)?;

// Bind, pass params as text, retrieve as binary
match frontend::bind(
Expand All @@ -104,14 +103,15 @@ where
Err(frontend::BindError::Serialization(e)) => Err(Error::encode(e)),
}?;

// Describe
frontend::describe(b'S', "", buf).map_err(Error::encode)?;

// Execute
frontend::execute("", 0, buf).map_err(Error::encode)?;

// Sync
frontend::sync(buf);

// Close
// frontend::close(b'S', "", buf).map_err(Error::encode)?;

Ok(buf.split().freeze())
})?;

Expand Down Expand Up @@ -212,7 +212,7 @@ async fn start(client: &InnerClient, buf: Bytes) -> Result<(Option<Statement>, R

loop {
match responses.next().await? {
Message::CloseComplete | Message::ParseComplete | Message::ReadyForQuery(_) => {}
Message::ParseComplete => {}
Message::BindComplete => return Ok((statement, responses)),
Message::ParameterDescription(body) => {
parameter_description = Some(body); // tooo-o-ooo-o loooove
Expand Down
1 change: 0 additions & 1 deletion tokio-postgres/src/simple_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ pub async fn batch_execute(client: &InnerClient, query: &str) -> Result<(), Erro
Message::ReadyForQuery(_) => return Ok(()),
Message::CommandComplete(_)
| Message::EmptyQueryResponse
| Message::CloseComplete
| Message::RowDescription(_)
| Message::DataRow(_) => {}
m => return Err(Error::unexpected_message(m)),
Expand Down