Started implementing chain to create pool

Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>

Author: chandr-andr

Cargo.lock

@@ -9,7 +9,7 @@ name = "psqlpy"
 crate-type = ["cdylib"]
 
 [dependencies]
-deadpool-postgres = { git = "https://github.com/chandr-andr/deadpool.git", version = "0.13.0" }
+deadpool-postgres = { git = "https://github.com/chandr-andr/deadpool.git", branch = "master" }
 pyo3 = { version = "*", features = ["chrono", "experimental-async"] }
 pyo3-asyncio = { git = "https://github.com/chandr-andr/pyo3-asyncio.git", version = "0.20.0", features = [
     "tokio-runtime",
@@ -24,13 +24,13 @@ uuid = { version = "1.7.0", features = ["v4"] }
 serde_json = "1.0.113"
 futures-util = "0.3.30"
 macaddr = "1.0.1"
-tokio-postgres = { git = "https://github.com/chandr-andr/rust-postgres.git", version = "0.7.10", features = [
+tokio-postgres = { git = "https://github.com/chandr-andr/rust-postgres.git", branch = "master", features = [
     "with-serde_json-1",
     "array-impls",
     "with-chrono-0_4",
     "with-uuid-1",
 ] }
-postgres-types = { git = "https://github.com/chandr-andr/rust-postgres.git", version = "0.2.6", features = [
+postgres-types = { git = "https://github.com/chandr-andr/rust-postgres.git", branch = "master", features = [
     "derive",
 ] }
-postgres-protocol = { git = "https://github.com/chandr-andr/rust-postgres.git", version = "*" }
+postgres-protocol = { git = "https://github.com/chandr-andr/rust-postgres.git", branch = "master" }

Cargo.toml

@@ -4,10 +4,12 @@
     ConnRecyclingMethod,
     Cursor,
     IsolationLevel,
+    KeepaliveConfig,
     LoadBalanceHosts,
     QueryResult,
     ReadVariant,
     SingleQueryResult,
+    SslMode,
     TargetSessionAttrs,
     Transaction,
     connect,
@@ -26,4 +28,6 @@
     "connect",
     "LoadBalanceHosts",
     "TargetSessionAttrs",
+    "SslMode",
+    "KeepaliveConfig",
 ]

python/psqlpy/__init__.py

@@ -171,6 +171,33 @@ class ConnRecyclingMethod(Enum):
     Verified = 2
     Clean = 3
 
+class SslMode(Enum):
+    """TLS configuration."""
+
+    # Do not use TLS.
+    Disable = 1
+    # Pay the overhead of encryption if the server insists on it.
+    Allow = 2
+    # Attempt to connect with TLS but allow sessions without.
+    Prefer = 3
+    # Require the use of TLS.
+    Require = 4
+    # I want my data encrypted,
+    # and I accept the overhead.
+    # I want to be sure that I connect to a server that I trust.
+    VerifyCa = 5
+    # I want my data encrypted,
+    # and I accept the overhead.
+    # I want to be sure that I connect to a server I trust,
+    # and that it's the one I specify.
+    VerifyFull = 6
+
+class KeepaliveConfig:
+    """Config for configuring keepalive."""
+
+    def __init__(self: Self, idle: int, interval: int, retries: int) -> None:
+        """Initialize new config."""
+
 class Cursor:
     """Represent opened cursor in a transaction.
 

python/psqlpy/_internal/__init__.pyi

@@ -1,5 +1,7 @@
+use std::time::Duration;
+
 use deadpool_postgres::RecyclingMethod;
-use pyo3::pyclass;
+use pyo3::{pyclass, pymethods};
 
 #[pyclass]
 #[derive(Clone, Copy)]
@@ -60,3 +62,60 @@ impl TargetSessionAttrs {
         }
     }
 }
+
+#[pyclass]
+#[derive(Clone, Copy)]
+pub enum SslMode {
+    /// Do not use TLS.
+    Disable,
+    /// Pay the overhead of encryption if the server insists on it.
+    Allow,
+    /// Attempt to connect with TLS but allow sessions without.
+    Prefer,
+    /// Require the use of TLS.
+    Require,
+    /// I want my data encrypted,
+    /// and I accept the overhead.
+    /// I want to be sure that I connect to a server that I trust.
+    VerifyCa,
+    /// I want my data encrypted,
+    /// and I accept the overhead.
+    /// I want to be sure that I connect to a server I trust,
+    /// and that it's the one I specify.
+    VerifyFull,
+}
+
+impl SslMode {
+    #[must_use]
+    pub fn to_internal(&self) -> tokio_postgres::config::SslMode {
+        match self {
+            SslMode::Disable => tokio_postgres::config::SslMode::Disable,
+            SslMode::Allow => tokio_postgres::config::SslMode::Allow,
+            SslMode::Prefer => tokio_postgres::config::SslMode::Prefer,
+            SslMode::Require => tokio_postgres::config::SslMode::Require,
+            SslMode::VerifyCa => tokio_postgres::config::SslMode::VerifyCa,
+            SslMode::VerifyFull => tokio_postgres::config::SslMode::VerifyFull,
+        }
+    }
+}
+
+#[pyclass]
+#[derive(Clone, Copy)]
+pub struct KeepaliveConfig {
+    pub idle: Duration,
+    pub interval: Option<Duration>,
+    pub retries: Option<u32>,
+}
+
+#[pymethods]
+impl KeepaliveConfig {
+    #[new]
+    fn build_config(idle: u64, interval: Option<u64>, retries: Option<u32>) -> Self {
+        let interval_internal = interval.map(Duration::from_secs);
+        KeepaliveConfig {
+            idle: Duration::from_secs(idle),
+            interval: interval_internal,
+            retries,
+        }
+    }
+}

src/driver/common_options.rs

@@ -105,7 +105,7 @@ pub fn connect(
 }
 
 #[pyclass]
-pub struct ConnectionPool(Pool);
+pub struct ConnectionPool(pub Pool);
 
 #[pymethods]
 impl ConnectionPool {