mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-16 18:02:56 +00:00
e61ec94fbc
Our rust-postgres fork is getting messy. Mostly because proxy wants more
control over the raw protocol than tokio-postgres provides. As such,
it's diverging more and more. Storage and compute also make use of
rust-postgres, but in more normal usage, thus they don't need our crazy
changes.
Idea:
* proxy maintains their subset
* other teams use a minimal patch set against upstream rust-postgres
Reviewing this code will be difficult. To implement it, I
1. Copied tokio-postgres, postgres-protocol and postgres-types from
00940fcdb5
2. Updated their package names with the `2` suffix to make them compile
in the workspace.
3. Updated proxy to use those packages
4. Copied in the code from tokio-postgres-rustls 0.13 (with some patches
applied https://github.com/jbg/tokio-postgres-rustls/pull/32
https://github.com/jbg/tokio-postgres-rustls/pull/33)
5. Removed as much dead code as I could find in the vendored libraries
6. Updated the tokio-postgres-rustls code to use our existing channel
binding implementation
65 lines
1.9 KiB
Rust
65 lines
1.9 KiB
Rust
use crate::query::RowStream;
|
|
use crate::types::Type;
|
|
use crate::{Client, Error, Transaction};
|
|
use async_trait::async_trait;
|
|
use postgres_protocol2::Oid;
|
|
|
|
mod private {
|
|
pub trait Sealed {}
|
|
}
|
|
|
|
/// A trait allowing abstraction over connections and transactions.
|
|
///
|
|
/// This trait is "sealed", and cannot be implemented outside of this crate.
|
|
#[async_trait]
|
|
pub trait GenericClient: private::Sealed {
|
|
/// Like `Client::query_raw_txt`.
|
|
async fn query_raw_txt<S, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
|
|
where
|
|
S: AsRef<str> + Sync + Send,
|
|
I: IntoIterator<Item = Option<S>> + Sync + Send,
|
|
I::IntoIter: ExactSizeIterator + Sync + Send;
|
|
|
|
/// Query for type information
|
|
async fn get_type(&self, oid: Oid) -> Result<Type, Error>;
|
|
}
|
|
|
|
impl private::Sealed for Client {}
|
|
|
|
#[async_trait]
|
|
impl GenericClient for Client {
|
|
async fn query_raw_txt<S, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
|
|
where
|
|
S: AsRef<str> + Sync + Send,
|
|
I: IntoIterator<Item = Option<S>> + Sync + Send,
|
|
I::IntoIter: ExactSizeIterator + Sync + Send,
|
|
{
|
|
self.query_raw_txt(statement, params).await
|
|
}
|
|
|
|
/// Query for type information
|
|
async fn get_type(&self, oid: Oid) -> Result<Type, Error> {
|
|
self.get_type(oid).await
|
|
}
|
|
}
|
|
|
|
impl private::Sealed for Transaction<'_> {}
|
|
|
|
#[async_trait]
|
|
#[allow(clippy::needless_lifetimes)]
|
|
impl GenericClient for Transaction<'_> {
|
|
async fn query_raw_txt<S, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
|
|
where
|
|
S: AsRef<str> + Sync + Send,
|
|
I: IntoIterator<Item = Option<S>> + Sync + Send,
|
|
I::IntoIter: ExactSizeIterator + Sync + Send,
|
|
{
|
|
self.query_raw_txt(statement, params).await
|
|
}
|
|
|
|
/// Query for type information
|
|
async fn get_type(&self, oid: Oid) -> Result<Type, Error> {
|
|
self.client().get_type(oid).await
|
|
}
|
|
}
|