psqlpy 0.11.3__tar.gz → 0.11.5__tar.gz

{psqlpy-0.11.3 → psqlpy-0.11.5}/Cargo.lock

@@ -992,7 +992,7 @@ dependencies = [
 
 [[package]]
 name = "psqlpy"
-version = "0.11.3"
+version = "0.11.5"
 dependencies = [
  "byteorder",
  "bytes",

{psqlpy-0.11.3 → psqlpy-0.11.5}/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "psqlpy"
-version = "0.11.3"
+version = "0.11.5"
 edition = "2021"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]

psqlpy-0.11.5/PKG-INFO

@@ -0,0 +1,31 @@
+Metadata-Version: 2.4
+Name: psqlpy
+Version: 0.11.5
+Classifier: Typing :: Typed
+Classifier: Topic :: Database
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Rust
+Classifier: Programming Language :: Python
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Database :: Front-Ends
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+License-File: LICENSE
+Summary: Async PostgreSQL driver for Python written in Rust
+Keywords: postgresql,psql,async-driver,psql-driver,postgresql-driver,python-driver
+Author: Kiselev Aleksandr
+Author-email: askiselev00@gmail.com
+Maintainer-email: Kiselev Aleksandr <askiselev00@gmail.com>
+Requires-Python: >=3.8
+Project-URL: homepage, https://github.com/psqlpy-python/psqlpy
+Project-URL: repository, https://github.com/psqlpy-python/psqlpy
+Project-URL: documentation, https://psqlpy-python.github.io/

{psqlpy-0.11.3 → psqlpy-0.11.5}/python/psqlpy/_internal/__init__.pyi

@@ -308,15 +308,8 @@ class Cursor:
     """
 
     array_size: int
-    cursor_name: str
     querystring: str
     parameters: ParamsT = None
-    prepared: bool | None
-    conn_dbname: str | None
-    user: str | None
-    host_addrs: list[str]
-    hosts: list[str]
-    ports: list[int]
 
     def __aiter__(self: Self) -> Self: ...
     async def __anext__(self: Self) -> QueryResult: ...

{psqlpy-0.11.3 → psqlpy-0.11.5}/python/tests/test_value_converter.py

@@ -178,6 +178,11 @@ async def test_as_class(
             JSONB([{"array": "json"}, {"one more": "test"}]),
             [{"array": "json"}, {"one more": "test"}],
         ),
+        (
+            "JSONB",
+            JSONB([1, "1", 1.0]),
+            [1, "1", 1.0],
+        ),
         (
             "JSON",
             {
@@ -194,6 +199,11 @@ async def test_as_class(
             JSON([{"array": "json"}, {"one more": "test"}]),
             [{"array": "json"}, {"one more": "test"}],
         ),
+        (
+            "JSON",
+            JSON([1, "1", 1.0]),
+            [1, "1", 1.0],
+        ),
         (
             "MACADDR",
             MacAddr6("08:00:2b:01:02:03"),

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/driver/connection.rs

@@ -401,7 +401,7 @@ impl Connection {
     /// Create new transaction object.
     ///
     /// # Errors
-    /// May return Err Result if db_client is None.
+    /// May return Err Result if `db_client` is None.
     #[pyo3(signature = (
         isolation_level=None,
         read_variant=None,

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/driver/connection_pool_builder.rs

@@ -76,7 +76,7 @@ impl ConnectionPoolBuilder {
         ))
     }
 
-    /// Set ca_file for ssl_mode in PostgreSQL.
+    /// Set `ca_file` for `ssl_mode` in `PostgreSQL`.
     fn ca_file(self_: Py<Self>, ca_file: String) -> Py<Self> {
         Python::with_gil(|gil| {
             let mut self_ = self_.borrow_mut(gil);
@@ -241,7 +241,7 @@ impl ConnectionPoolBuilder {
     /// Sets the TCP user timeout.
     ///
     /// This is ignored for Unix domain socket connections. It is only supported on systems where
-    /// TCP_USER_TIMEOUT is available and will default to the system default if omitted or set to 0;
+    /// `TCP_USER_TIMEOUT` is available and will default to the system default if omitted or set to 0;
     /// on other systems, it has no effect.
     #[must_use]
     pub fn tcp_user_timeout(self_: Py<Self>, tcp_user_timeout: u64) -> Py<Self> {
@@ -314,7 +314,7 @@ impl ConnectionPoolBuilder {
     }
 
     /// Sets the time interval between TCP keepalive probes.
-    /// On Windows, this sets the value of the tcp_keepalive struct’s keepaliveinterval field.
+    /// On Windows, this sets the value of the `tcp_keepalive` struct’s keepaliveinterval field.
     ///
     /// This is ignored for Unix domain sockets, or if the `keepalives` option is disabled.
     #[must_use]

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/driver/cursor.rs

@@ -73,6 +73,16 @@ impl Drop for Cursor {
 
 #[pymethods]
 impl Cursor {
+    #[getter]
+    fn get_querystring(&self) -> Option<String> {
+        self.querystring.clone()
+    }
+
+    #[getter]
+    fn get_parameters(&self) -> Option<Py<PyAny>> {
+        self.parameters.clone()
+    }
+
     #[getter]
     fn get_array_size(&self) -> i32 {
         self.array_size

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/driver/transaction.rs

@@ -309,7 +309,7 @@ impl Transaction {
     /// Execute many queries in a transaction.
     ///
     /// More information in a documentation:
-    /// https://psqlpy-python.github.io/components/transaction.html#pipeline
+    /// `<https://psqlpy-python.github.io/components/transaction.html#pipeline>`
     ///
     /// # Errors
     /// Can return error if there is a problem with DB communication.

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/extra_types.rs

@@ -97,7 +97,7 @@ impl Text {
 
 #[pymethods]
 impl Text {
-    /// Create new PyText from Python str.
+    /// Create new `PyText` from Python str.
     #[new]
     #[allow(clippy::missing_errors_doc)]
     #[must_use]
@@ -121,7 +121,7 @@ impl VarChar {
 
 #[pymethods]
 impl VarChar {
-    /// Create new PyVarChar from Python str.
+    /// Create new `PyVarChar` from Python str.
     #[new]
     #[allow(clippy::missing_errors_doc)]
     #[must_use]

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/options.rs

@@ -175,7 +175,7 @@ pub enum SynchronousCommit {
     /// As the name indicates, the commit acknowledgment can come before
     /// flushing the records to disk.
     /// This is generally called as an asynchronous commit.
-    /// If the PostgreSQL instance crashes,
+    /// If the `PostgreSQL` instance crashes,
     /// the last few asynchronous commits might be lost.
     Off,
     /// WAL records are written and flushed to local disks.

{psqlpy-0.11.3 → psqlpy-0.11.5}/src/value_converter/models/serde_value.rs

@@ -67,16 +67,12 @@ fn serde_value_from_list(_gil: Python<'_>, bind_value: &Bound<'_, PyAny>) -> PSQ
     let mut result_vec: Vec<Value> = Vec::with_capacity(py_list.len());
 
     for item in py_list.iter() {
-        if item.is_instance_of::<PyDict>() {
-            let python_dto = from_python_untyped(&item)?;
-            result_vec.push(python_dto.to_serde_value()?);
-        } else if item.is_instance_of::<PyList>() {
+        if item.is_instance_of::<PyList>() {
             let serde_value = build_serde_value(&item)?;
             result_vec.push(serde_value);
         } else {
-            return Err(RustPSQLDriverError::PyToRustValueConversionError(
-                "Items in JSON array must be dicts or lists.".to_string(),
-            ));
+            let python_dto = from_python_untyped(&item)?;
+            result_vec.push(python_dto.to_serde_value()?);
         }
     }
 
@@ -112,17 +108,17 @@ fn serde_value_from_dict(bind_value: &Bound<'_, PyAny>) -> PSQLPyResult<Value> {
 /// # Errors
 /// May return error if cannot convert Python type into Rust one.
 #[allow(clippy::needless_pass_by_value)]
+#[allow(clippy::needless_return)]
 pub fn build_serde_value(value: &Bound<'_, PyAny>) -> PSQLPyResult<Value> {
     Python::with_gil(|gil| {
         if value.is_instance_of::<PyList>() {
-            serde_value_from_list(gil, value)
+            return serde_value_from_list(gil, value);
         } else if value.is_instance_of::<PyDict>() {
             return serde_value_from_dict(value);
-        } else {
-            return Err(RustPSQLDriverError::PyToRustValueConversionError(
-                "PyJSON must be dict value.".to_string(),
-            ));
         }
+        Err(RustPSQLDriverError::PyToRustValueConversionError(
+            "PyJSON must be dict or list value.".to_string(),
+        ))
     })
 }
 

psqlpy-0.11.3/PKG-INFO

@@ -1,110 +0,0 @@
-Metadata-Version: 2.4
-Name: psqlpy
-Version: 0.11.3
-Classifier: Typing :: Typed
-Classifier: Topic :: Database
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Rust
-Classifier: Programming Language :: Python
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Database :: Front-Ends
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-License-File: LICENSE
-Summary: Async PostgreSQL driver for Python written in Rust
-Keywords: postgresql,psql,async-driver,psql-driver,postgresql-driver,python-driver
-Author: Kiselev Aleksandr
-Author-email: askiselev00@gmail.com
-Maintainer-email: Kiselev Aleksandr <askiselev00@gmail.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: homepage, https://github.com/psqlpy-python/psqlpy
-Project-URL: repository, https://github.com/psqlpy-python/psqlpy
-Project-URL: documentation, https://psqlpy-python.github.io/
-
-[![PyPI - Python Version](https://img.shields.io/badge/PYTHON-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue?style=for-the-badge
-)](https://pypi.org/project/psqlpy/)
-[![PyPI - Python Version](https://img.shields.io/badge/Tested%20On%20PostgreSQL-14%20%7C%2015%20%7C%2016%20%7C17-2be28a?style=for-the-badge
-)](https://pypi.org/project/psqlpy/)
-[![PyPI](https://img.shields.io/pypi/v/psqlpy?style=for-the-badge)](https://pypi.org/project/psqlpy/)
-[![PyPI - Downloads](https://img.shields.io/pypi/dm/psqlpy?style=for-the-badge)](https://pypistats.org/packages/psqlpy)
-
-# PSQLPy - Async PostgreSQL driver for Python written in Rust.
-
-Driver for PostgreSQL written fully in Rust and exposed to Python.
-Main goals of the library is speed and type safety.
-
-## Documentation
-You can find full documentation here - [PSQLPy documentation](https://psqlpy-python.github.io/)
-
-## Installation
-
-You can install package with `pip` or `poetry`.
-
-poetry:
-
-```bash
-> poetry add psqlpy
-```
-
-pip:
-
-```bash
-> pip install psqlpy
-```
-
-Or you can build it by yourself. To do it, install stable rust and [maturin](https://github.com/PyO3/maturin).
-
-```
-> maturin develop --release
-```
-
-## Usage
-
-Usage is as easy as possible.
-Create new instance of ConnectionPool and start querying.
-You don't need to startup connection pool, the connection pool will create connections as needed.
-
-```python
-from typing import Any
-
-from psqlpy import ConnectionPool, QueryResult
-
-
-async def main() -> None:
-    db_pool = ConnectionPool(
-        username="postgres",
-        password="pg_password",
-        host="localhost",
-        port=5432,
-        db_name="postgres",
-        max_db_pool_size=2,
-    )
-
-    async with db_pool.acquire() as conn:
-        res: QueryResult = await conn.execute(
-            "SELECT * FROM users",
-        )
-
-    print(res.result())
-    db_pool.close()
-
-```
-
-## Benchmarks
-
-You can find benchmarks with visualization on our [docs](https://psqlpy-python.github.io/benchmarks.html)
-
-## Community
-Let's make `PSQLPy` better together!
-Join our community in [Telegram](https://t.me/+f3Y8mYKgXxhmYThi)
-