Skip to content

Add done_query methods to query traits #265

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
d00z3l wants to merge 2 commits into from
Closed

Add done_query methods to query traits #265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6ce3d
Add done_query methods to query traits
d00z3l Jun 4, 2025
041ef84
Add done_query to extended on_execute
d00z3l Jun 4, 2025
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
25 changes: 25 additions & 0 deletions src/api/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ pub trait SimpleQueryHandler: Send + Sync {
send_ready_for_query(client, transaction_status).await?;
};

self.done_query(client).await?;

Ok(())
}

Expand All @@ -126,6 +128,16 @@ pub trait SimpleQueryHandler: Send + Sync {
C: ClientInfo + ClientPortalStore + Sink<PgWireBackendMessage> + Unpin + Send + Sync,
C::Error: Debug,
PgWireError: From<<C as Sink<PgWireBackendMessage>>::Error>;

/// Called after the query has been completed
async fn done_query<C>(&self, _client: &mut C) -> PgWireResult<()>
where
C: ClientInfo + ClientPortalStore + Sink<PgWireBackendMessage> + Unpin + Send + Sync,
C::Error: Debug,
PgWireError: From<<C as Sink<PgWireBackendMessage>>::Error>,
{
Ok(())
}
}

#[async_trait]
Expand Down Expand Up @@ -256,6 +268,8 @@ pub trait ExtendedQueryHandler: Send + Sync {
client.set_transaction_status(transaction_status);
};

self.done_query(client).await?;

Ok(())
} else {
Err(PgWireError::PortalNotFound(portal_name.to_owned()))
Expand Down Expand Up @@ -395,6 +409,17 @@ pub trait ExtendedQueryHandler: Send + Sync {
C::PortalStore: PortalStore<Statement = Self::Statement>,
C::Error: Debug,
PgWireError: From<<C as Sink<PgWireBackendMessage>>::Error>;

/// Called after the query has been completed
async fn done_query<C>(&self, _client: &mut C) -> PgWireResult<()>
where
C: ClientInfo + ClientPortalStore + Sink<PgWireBackendMessage> + Unpin + Send + Sync,
C::PortalStore: PortalStore<Statement = Self::Statement>,
C::Error: Debug,
PgWireError: From<<C as Sink<PgWireBackendMessage>>::Error>,
{
Ok(())
}
}

/// Helper function to send `QueryResponse` and optional `RowDescription` to client
Expand Down
Loading