psqlpy 0.11.1__tar.gz → 0.11.2__tar.gz

{psqlpy-0.11.1 → psqlpy-0.11.2}/.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
+          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
           sccache: 'true'
           manylinux: auto
           before-script-linux: |
@@ -112,7 +112,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
+          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
           sccache: 'true'
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -168,7 +168,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
+          args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
           manylinux: musllinux_1_2
       - name: Upload wheels
         uses: actions/upload-artifact@v4

{psqlpy-0.11.1 → psqlpy-0.11.2}/.github/workflows/test.yaml

@@ -30,7 +30,7 @@ jobs:
     - uses: actions-rs/clippy-check@v1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-        args: -p psqlpy --all-features -- -W clippy::all -W clippy::pedantic
+        args: -p psqlpy --all-features -- -W clippy::all -W clippy::pedantic -D warnings
   pytest:
     name: ${{matrix.job.os}}-${{matrix.py_version}}-${{ matrix.postgres_version }}
     strategy:

{psqlpy-0.11.1 → psqlpy-0.11.2}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
   - repo: https://github.com/pre-commit/mirrors-mypy
@@ -58,6 +58,8 @@ repos:
           - clippy::all
           - -W
           - clippy::pedantic
+          - -D
+          - warnings
 
       - id: check
         types:

{psqlpy-0.11.1 → psqlpy-0.11.2}/Cargo.lock

@@ -1006,7 +1006,7 @@ dependencies = [
 
 [[package]]
 name = "psqlpy"
-version = "0.11.1"
+version = "0.11.2"
 dependencies = [
  "byteorder",
  "bytes",
@@ -1063,11 +1063,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
+checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
 dependencies = [
- "cfg-if",
  "chrono",
  "indoc",
  "inventory",
@@ -1084,8 +1083,8 @@ dependencies = [
 
 [[package]]
 name = "pyo3-async-runtimes"
-version = "0.23.0"
-source = "git+https://github.com/chandr-andr/pyo3-async-runtimes.git?branch=psqlpy#c2b8441b4910b0b5100536b23c7a2fd43f9eacd0"
+version = "0.25.0"
+source = "git+https://github.com/chandr-andr/pyo3-async-runtimes.git?branch=psqlpy#74cd232b0606cd9e0dcab291bd10a8cadf69a1ed"
 dependencies = [
  "futures",
  "once_cell",
@@ -1096,9 +1095,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
+checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1106,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
+checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1116,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
+checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1128,9 +1127,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
+checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1473,9 +1472,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
 
 [[package]]
 name = "thiserror"

{psqlpy-0.11.1 → psqlpy-0.11.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "psqlpy"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 deadpool-postgres = { git = "https://github.com/chandr-andr/deadpool.git", branch = "psqlpy" }
-pyo3 = { version = "0.23.4", features = [
+pyo3 = { version = "0.25.1", features = [
     "chrono",
     "experimental-async",
     "rust_decimal",

{psqlpy-0.11.1 → psqlpy-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psqlpy
-Version: 0.11.1
+Version: 0.11.2
 Classifier: Typing :: Typed
 Classifier: Topic :: Database
 Classifier: Development Status :: 4 - Beta

{psqlpy-0.11.1 → psqlpy-0.11.2}/python/psqlpy/_internal/__init__.pyi

@@ -815,16 +815,6 @@ class Connection:
 
         Return representation of prepared statement.
         """
-    async def commit(self: Self) -> None:
-        """Commit the transaction.
-
-        Do nothing if there is no active transaction.
-        """
-    async def rollback(self: Self) -> None:
-        """Rollback the transaction.
-
-        Do nothing if there is no active transaction.
-        """
     async def execute(
         self: Self,
         querystring: str,

{psqlpy-0.11.1 → psqlpy-0.11.2}/src/connection/impls.rs

@@ -31,9 +31,9 @@ where
     ) -> PSQLPyResult<()> {
         let start_qs = self.build_start_qs(isolation_level, read_variant, deferrable);
         self.batch_execute(start_qs.as_str()).await.map_err(|err| {
-            RustPSQLDriverError::TransactionBeginError(
-                format!("Cannot start transaction due to - {err}").into(),
-            )
+            RustPSQLDriverError::TransactionBeginError(format!(
+                "Cannot start transaction due to - {err}"
+            ))
         })?;
 
         Ok(())
@@ -65,7 +65,7 @@ impl Connection for SingleConnection {
         if !prepared {
             self.drop_prepared(&prepared_stmt).await?;
         }
-        return Ok(prepared_stmt);
+        Ok(prepared_stmt)
     }
 
     async fn drop_prepared(&self, stmt: &Statement) -> PSQLPyResult<()> {
@@ -110,34 +110,36 @@ impl Connection for SingleConnection {
 }
 
 impl StartTransaction for SingleConnection {
+    #[allow(clippy::used_underscore_items)]
     async fn start_transaction(
         &mut self,
         isolation_level: Option<IsolationLevel>,
         read_variant: Option<ReadVariant>,
         deferrable: Option<bool>,
     ) -> PSQLPyResult<()> {
-        let res = self
-            ._start_transaction(isolation_level, read_variant, deferrable)
+        self._start_transaction(isolation_level, read_variant, deferrable)
             .await?;
         self.in_transaction = true;
 
-        Ok(res)
+        Ok(())
     }
 }
 
 impl CloseTransaction for SingleConnection {
+    #[allow(clippy::used_underscore_items)]
     async fn commit(&mut self) -> PSQLPyResult<()> {
-        let res = self._commit().await?;
+        self._commit().await?;
         self.in_transaction = false;
 
-        Ok(res)
+        Ok(())
     }
 
+    #[allow(clippy::used_underscore_items)]
     async fn rollback(&mut self) -> PSQLPyResult<()> {
-        let res = self._rollback().await?;
+        self._rollback().await?;
         self.in_transaction = false;
 
-        Ok(res)
+        Ok(())
     }
 }
 
@@ -149,7 +151,7 @@ impl Connection for PoolConnection {
 
         let prepared = self.connection.prepare(query).await?;
         self.drop_prepared(&prepared).await?;
-        return Ok(prepared);
+        Ok(prepared)
     }
 
     async fn drop_prepared(&self, stmt: &Statement) -> PSQLPyResult<()> {
@@ -194,6 +196,7 @@ impl Connection for PoolConnection {
 }
 
 impl StartTransaction for PoolConnection {
+    #[allow(clippy::used_underscore_items)]
     async fn start_transaction(
         &mut self,
         isolation_level: Option<IsolationLevel>,
@@ -207,18 +210,20 @@ impl StartTransaction for PoolConnection {
 }
 
 impl CloseTransaction for PoolConnection {
+    #[allow(clippy::used_underscore_items)]
     async fn commit(&mut self) -> PSQLPyResult<()> {
-        let res = self._commit().await?;
+        self._commit().await?;
         self.in_transaction = false;
 
-        Ok(res)
+        Ok(())
     }
 
+    #[allow(clippy::used_underscore_items)]
     async fn rollback(&mut self) -> PSQLPyResult<()> {
-        let res = self._rollback().await?;
+        self._rollback().await?;
         self.in_transaction = false;
 
-        Ok(res)
+        Ok(())
     }
 }
 
@@ -325,6 +330,7 @@ impl CloseTransaction for PSQLPyConnection {
 }
 
 impl PSQLPyConnection {
+    #[must_use]
     pub fn in_transaction(&self) -> bool {
         match self {
             PSQLPyConnection::PoolConn(conn) => conn.in_transaction,
@@ -332,6 +338,10 @@ impl PSQLPyConnection {
         }
     }
 
+    /// Prepare internal `PSQLPy` statement
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
     pub async fn prepare_statement(
         &self,
         querystring: String,
@@ -342,6 +352,10 @@ impl PSQLPyConnection {
             .await
     }
 
+    /// Execute prepared `PSQLPy` statement.
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
     pub async fn execute_statement(
         &self,
         statement: &PsqlpyStatement,
@@ -353,6 +367,10 @@ impl PSQLPyConnection {
         Ok(PSQLDriverPyQueryResult::new(result))
     }
 
+    /// Execute raw query with parameters.
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
     pub async fn execute(
         &self,
         querystring: String,
@@ -364,15 +382,12 @@ impl PSQLPyConnection {
             .await?;
 
         let prepared = prepared.unwrap_or(true);
-        let result = match prepared {
-            true => {
-                self.query(statement.statement_query()?, &statement.params())
-                    .await
-            }
-            false => {
-                self.query_typed(statement.raw_query(), &statement.params_typed())
-                    .await
-            }
+        let result = if prepared {
+            self.query(statement.statement_query()?, &statement.params())
+                .await
+        } else {
+            self.query_typed(statement.raw_query(), &statement.params_typed())
+                .await
         };
 
         let return_result = result.map_err(|err| {
@@ -384,6 +399,10 @@ impl PSQLPyConnection {
         Ok(PSQLDriverPyQueryResult::new(return_result))
     }
 
+    /// Execute many queries without return.
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
     pub async fn execute_many(
         &self,
         querystring: String,
@@ -407,14 +426,14 @@ impl PSQLPyConnection {
 
         for statement in statements {
             let querystring_result = if prepared {
-                let prepared_stmt = &self.prepare(&statement.raw_query(), true).await;
+                let prepared_stmt = &self.prepare(statement.raw_query(), true).await;
                 if let Err(error) = prepared_stmt {
                     return Err(RustPSQLDriverError::ConnectionExecuteError(format!(
                         "Cannot prepare statement in execute_many, operation rolled back {error}",
                     )));
                 }
                 self.query(
-                    &self.prepare(&statement.raw_query(), true).await?,
+                    &self.prepare(statement.raw_query(), true).await?,
                     &statement.params(),
                 )
                 .await
@@ -429,9 +448,14 @@ impl PSQLPyConnection {
             }
         }
 
-        return Ok(());
+        Ok(())
     }
 
+    /// Execute raw query with parameters. Return one raw row
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn fetch_row_raw(
         &self,
         querystring: String,
@@ -447,7 +471,7 @@ impl PSQLPyConnection {
         let result = if prepared {
             self.query_one(
                 &self
-                    .prepare(&statement.raw_query(), true)
+                    .prepare(statement.raw_query(), true)
                     .await
                     .map_err(|err| {
                         RustPSQLDriverError::ConnectionExecuteError(format!(
@@ -464,9 +488,14 @@ impl PSQLPyConnection {
                 .map_err(|err| RustPSQLDriverError::ConnectionExecuteError(format!("{err}")))?
         };
 
-        return Ok(result);
+        Ok(result)
     }
 
+    /// Execute raw query with parameters. Return one row
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn fetch_row(
         &self,
         querystring: String,
@@ -477,9 +506,14 @@ impl PSQLPyConnection {
             .fetch_row_raw(querystring, parameters, prepared)
             .await?;
 
-        return Ok(PSQLDriverSinglePyQueryResult::new(result));
+        Ok(PSQLDriverSinglePyQueryResult::new(result))
     }
 
+    /// Execute raw query with parameters. Return single python object
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn fetch_val(
         &self,
         querystring: String,
@@ -490,12 +524,17 @@ impl PSQLPyConnection {
             .fetch_row_raw(querystring, parameters, prepared)
             .await?;
 
-        return Python::with_gil(|gil| match result.columns().first() {
+        Python::with_gil(|gil| match result.columns().first() {
             Some(first_column) => postgres_to_py(gil, &result, first_column, 0, &None),
             None => Ok(gil.None()),
-        });
+        })
     }
 
+    /// Create new sink for COPY operation.
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn copy_in<T, U>(&self, statement: &T) -> PSQLPyResult<CopyInSink<U>>
     where
         T: ?Sized + ToStatement,
@@ -511,6 +550,14 @@ impl PSQLPyConnection {
         }
     }
 
+    /// Create and open new transaction.
+    ///
+    /// Unsafe here isn't a problem cuz it is stored within
+    /// the struct with the connection created this transaction.
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn transaction(&mut self) -> PSQLPyResult<PSQLPyTransaction> {
         match self {
             PSQLPyConnection::PoolConn(conn) => {
@@ -532,33 +579,33 @@ impl PSQLPyConnection {
         }
     }
 
+    /// Create new Portal (server-side byte cursor).
+    ///
+    /// # Errors
+    /// May return error if there is some problem with DB communication.
+    /// Or if cannot build statement.
     pub async fn portal(
         &mut self,
         querystring: Option<&String>,
         parameters: &Option<pyo3::Py<PyAny>>,
         statement: Option<&PsqlpyStatement>,
     ) -> PSQLPyResult<(PSQLPyTransaction, tp_Portal)> {
-        let statement = {
-            match statement {
-                Some(stmt) => stmt,
-                None => {
-                    let Some(querystring) = querystring else {
-                        return Err(RustPSQLDriverError::ConnectionExecuteError(
-                            "Can't create cursor without querystring".into(),
-                        ));
-                    };
-
-                    &StatementBuilder::new(querystring, parameters, self, Some(false))
-                        .build()
-                        .await?
-                }
-            }
+        let stmt = if let Some(stmt) = statement {
+            stmt
+        } else {
+            let Some(querystring) = querystring else {
+                return Err(RustPSQLDriverError::ConnectionExecuteError(
+                    "Can't create cursor without querystring".into(),
+                ));
+            };
+
+            &StatementBuilder::new(querystring, parameters, self, Some(false))
+                .build()
+                .await?
         };
 
         let transaction = self.transaction().await?;
-        let inner_portal = transaction
-            .portal(statement.raw_query(), &statement.params())
-            .await?;
+        let inner_portal = transaction.portal(stmt.raw_query(), &stmt.params()).await?;
 
         Ok((transaction, inner_portal))
     }

{psqlpy-0.11.1 → psqlpy-0.11.2}/src/connection/structs.rs

@@ -12,6 +12,7 @@ pub struct PoolConnection {
 }
 
 impl PoolConnection {
+    #[must_use]
     pub fn new(connection: Object, pg_config: Arc<Config>) -> Self {
         Self {
             connection,
@@ -31,6 +32,7 @@ pub struct SingleConnection {
 }
 
 impl SingleConnection {
+    #[must_use]
     pub fn new(connection: Client, pg_config: Arc<Config>) -> Self {
         Self {
             connection,

{psqlpy-0.11.1 → psqlpy-0.11.2}/src/connection/traits.rs

@@ -1,5 +1,4 @@
 use postgres_types::{ToSql, Type};
-use pyo3::PyAny;
 use tokio_postgres::{Row, Statement, ToStatement};
 
 use crate::exceptions::rust_errors::PSQLPyResult;
@@ -58,7 +57,7 @@ pub trait Transaction {
         if let Some(level) = isolation_level {
             let level = &level.to_str_level();
             querystring.push_str(format!(" ISOLATION LEVEL {level}").as_str());
-        };
+        }
 
         querystring.push_str(match read_variant {
             Some(ReadVariant::ReadOnly) => " READ ONLY",

{psqlpy-0.11.1 → psqlpy-0.11.2}/src/driver/common.rs

@@ -133,20 +133,21 @@ macro_rules! impl_cursor_method {
         #[pymethods]
         impl $name {
             #[pyo3(signature = (querystring=None, parameters=None, array_size=None))]
+            #[must_use]
             pub fn cursor(
                 &self,
                 querystring: Option<String>,
                 parameters: Option<Py<PyAny>>,
                 array_size: Option<i32>,
-            ) -> PSQLPyResult<Cursor> {
-                Ok(Cursor::new(
+            ) -> Cursor {
+                Cursor::new(
                     self.conn.clone(),
                     querystring,
                     parameters,
                     array_size,
                     self.pg_config.clone(),
                     None,
-                ))
+                )
             }
         }
     };
@@ -159,6 +160,10 @@ macro_rules! impl_prepare_method {
     ($name:ident) => {
         #[pymethods]
         impl $name {
+            /// Create new prepared statement.
+            ///
+            /// # Errors
+            /// May return error if there is some problem with DB communication.
             #[pyo3(signature = (querystring, parameters=None))]
             pub async fn prepare(
                 &self,
@@ -191,6 +196,10 @@ macro_rules! impl_transaction_methods {
     ($name:ident, $val:expr $(,)?) => {
         #[pymethods]
         impl $name {
+            /// Commit existing transaction.
+            ///
+            /// # Errors
+            /// May return error if there is some problem with DB communication.
             pub async fn commit(&mut self) -> PSQLPyResult<()> {
                 let conn = self.conn.clone();
                 let Some(conn) = conn else {
@@ -206,6 +215,10 @@ macro_rules! impl_transaction_methods {
                 Ok(())
             }
 
+            /// Rollback existing transaction.
+            ///
+            /// # Errors
+            /// May return error if there is some problem with DB communication.
             pub async fn rollback(&mut self) -> PSQLPyResult<()> {
                 let conn = self.conn.clone();
                 let Some(conn) = conn else {
@@ -230,6 +243,10 @@ macro_rules! impl_binary_copy_method {
     ($name:ident) => {
         #[pymethods]
         impl $name {
+            /// Perform binary copy to table.
+            ///
+            /// # Errors
+            /// May return error if there is some problem with DB communication.
             #[pyo3(signature = (source, table_name, columns=None, schema_name=None))]
             pub async fn binary_copy_to_table(
                 self_: pyo3::Py<Self>,

{psqlpy-0.11.1 → psqlpy-0.11.2}/src/driver/connection.rs

@@ -158,7 +158,7 @@ impl Connection {
         read_conn_g.in_transaction()
     }
 
-    async fn __aenter__<'a>(self_: Py<Self>) -> PSQLPyResult<Py<Self>> {
+    async fn __aenter__(self_: Py<Self>) -> PSQLPyResult<Py<Self>> {
         let (db_client, db_pool, pg_config) = pyo3::Python::with_gil(|gil| {
             let self_ = self_.borrow(gil);
             (
@@ -191,7 +191,7 @@ impl Connection {
     }
 
     #[allow(clippy::unused_async)]
-    async fn __aexit__<'a>(
+    async fn __aexit__(
         self_: Py<Self>,
         _exception_type: Py<PyAny>,
         exception: Py<PyAny>,
@@ -278,7 +278,7 @@ impl Connection {
     /// 1) Cannot convert python parameters
     /// 2) Cannot execute querystring.
     #[pyo3(signature = (querystring, parameters=None, prepared=None))]
-    pub async fn execute_many<'a>(
+    pub async fn execute_many(
         self_: pyo3::Py<Self>,
         querystring: String,
         parameters: Option<Vec<Py<PyAny>>>,
@@ -369,7 +369,7 @@ impl Connection {
     /// 2) Cannot execute querystring.
     /// 3) Query returns more than one row
     #[pyo3(signature = (querystring, parameters=None, prepared=None))]
-    pub async fn fetch_val<'a>(
+    pub async fn fetch_val(
         self_: pyo3::Py<Self>,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,