Merge pull request #154 from psqlpy-python/feature/just_array_in_jsonb_column

Added support for just array in JSONB column

Author: chandr-andr

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"),

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,

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]

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.

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]

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.

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(),
+        ))
     })
 }