Refactor value converter

src/driver/inner_connection.rs

@@ -8,7 +8,11 @@
 use crate::{
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     query_result::{PSQLDriverPyQueryResult, PSQLDriverSinglePyQueryResult},
-    value_converter::{convert_parameters_and_qs, postgres_to_py, PythonDTO, QueryParameter},
+    value_converter::{
+        consts::QueryParameter,
+        funcs::{from_python::convert_parameters_and_qs, to_python::postgres_to_py},
+        models::dto::PythonDTO,
+    },
 };
 
 #[allow(clippy::module_name_repetitions)]
@@ -82,12 +86,12 @@
         }
     }
 
     pub async fn cursor_execute(
         &self,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<PSQLDriverPyQueryResult> {
         let prepared = prepared.unwrap_or(true);
 
         let (qs, params) = convert_parameters_and_qs(querystring, parameters)?;
@@ -124,12 +128,12 @@
         Ok(PSQLDriverPyQueryResult::new(result))
     }
 
     pub async fn execute(
         &self,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<PSQLDriverPyQueryResult> {
         let prepared = prepared.unwrap_or(true);
 
         let (qs, params) = convert_parameters_and_qs(querystring, parameters)?;
@@ -166,12 +170,12 @@
         Ok(PSQLDriverPyQueryResult::new(result))
     }
 
     pub async fn execute_many(
         &self,
         mut querystring: String,
         parameters: Option<Vec<Py<PyAny>>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<()> {
         let prepared = prepared.unwrap_or(true);
 
         let mut params: Vec<Vec<PythonDTO>> = vec![];
@@ -212,15 +216,15 @@
             }
         }
 
         return Ok(());
     }
 
     pub async fn fetch_row_raw(
         &self,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<Row> {
         let prepared = prepared.unwrap_or(true);
 
         let (qs, params) = convert_parameters_and_qs(querystring, parameters)?;
@@ -254,36 +258,36 @@
             })?
         };
 
         return Ok(result);
     }
 
     pub async fn fetch_row(
         &self,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<PSQLDriverSinglePyQueryResult> {
         let result = self
             .fetch_row_raw(querystring, parameters, prepared)
             .await?;
 
         return Ok(PSQLDriverSinglePyQueryResult::new(result));
     }
 
     pub async fn fetch_val(
         &self,
         querystring: String,
         parameters: Option<pyo3::Py<PyAny>>,
         prepared: Option<bool>,
     ) -> RustPSQLDriverPyResult<Py<PyAny>> {
         let result = self
             .fetch_row_raw(querystring, parameters, prepared)
             .await?;
 
         return Python::with_gil(|gil| match result.columns().first() {
             Some(first_column) => postgres_to_py(gil, &result, first_column, 0, &None),
             None => Ok(gil.None()),
         });
     }
 
     /// Prepare cached statement.

src/extra_types.rs

@@ -10,11 +10,13 @@ use pyo3::{
 use serde_json::Value;
 
 use crate::{
-    additional_types::{Circle as RustCircle, Line as RustLine},
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     value_converter::{
-        build_flat_geo_coords, build_geo_coords, build_serde_value,
-        py_sequence_into_postgres_array, PythonDTO,
+        additional_types::{Circle as RustCircle, Line as RustLine},
+        funcs::from_python::{
+            build_flat_geo_coords, build_geo_coords, py_sequence_into_postgres_array,
+        },
+        models::{dto::PythonDTO, serde_value::build_serde_value},
     },
 };
 

src/lib.rs

@@ -1,4 +1,3 @@
-pub mod additional_types;
 pub mod common;
 pub mod driver;
 pub mod exceptions;

src/query_result.rs

@@ -1,7 +1,10 @@
 use pyo3::{prelude::*, pyclass, pymethods, types::PyDict, Py, PyAny, Python, ToPyObject};
 use tokio_postgres::Row;
 
-use crate::{exceptions::rust_errors::RustPSQLDriverPyResult, value_converter::postgres_to_py};
+use crate::{
+    exceptions::rust_errors::RustPSQLDriverPyResult,
+    value_converter::funcs::to_python::postgres_to_py,
+};
 
 /// Convert postgres `Row` into Python Dict.
 ///
@@ -19,7 +22,7 @@
     let python_dict = PyDict::new(py);
     for (column_idx, column) in postgres_row.columns().iter().enumerate() {
         let python_type = postgres_to_py(py, postgres_row, column, column_idx, custom_decoders)?;
         python_dict.set_item(column.name().to_object(py), python_type)?;
     }
     Ok(python_dict)
 }
@@ -67,7 +70,7 @@
         for row in &self.inner {
             result.push(row_to_dict(py, row, &custom_decoders)?);
         }
         Ok(result.to_object(py))
     }
 
     /// Convert result from database to any class passed from Python.
@@ -89,7 +92,7 @@
             res.push(convert_class_inst);
         }
 
         Ok(res.to_object(py))
     }
 
     /// Convert result from database with function passed from Python.
@@ -112,7 +115,7 @@
             let row_factory_class = row_factory.call(py, (pydict,), None)?;
             res.push(row_factory_class);
         }
         Ok(res.to_object(py))
     }
 }
 
@@ -153,7 +156,7 @@
         py: Python<'_>,
         custom_decoders: Option<Py<PyDict>>,
     ) -> RustPSQLDriverPyResult<Py<PyAny>> {
         Ok(row_to_dict(py, &self.inner, &custom_decoders)?.to_object(py))
     }
 
     /// Convert result from database to any class passed from Python.
@@ -187,7 +190,7 @@
         row_factory: Py<PyAny>,
         custom_decoders: Option<Py<PyDict>>,
     ) -> RustPSQLDriverPyResult<Py<PyAny>> {
         let pydict = row_to_dict(py, &self.inner, &custom_decoders)?.to_object(py);
         Ok(row_factory.call(py, (pydict,), None)?)
     }
 }