Refactored execute-like methods

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

Author: chandr-andr

src/common.rs

@@ -1,13 +1,6 @@
 use pyo3::{
     types::{PyAnyMethods, PyModule, PyModuleMethods},
-    Bound, PyAny, PyResult, Python,
-};
-
-use crate::{
-    driver::connection::PsqlpyConnection,
-    exceptions::rust_errors::RustPSQLDriverPyResult,
-    query_result::{PSQLDriverPyQueryResult, PSQLDriverSinglePyQueryResult},
-    value_converter::{convert_parameters, PythonDTO, QueryParameter},
+    Bound, PyResult, Python,
 };
 
 /// Add new module to the parent one.
@@ -33,104 +26,3 @@ pub fn add_module(
     )?;
     Ok(())
 }
-
-pub trait ObjectQueryTrait {
-    fn psqlpy_query_one(
-        &self,
-        querystring: String,
-        parameters: Option<pyo3::Py<PyAny>>,
-        prepared: Option<bool>,
-    ) -> impl std::future::Future<Output = RustPSQLDriverPyResult<PSQLDriverSinglePyQueryResult>> + Send;
-
-    fn psqlpy_query(
-        &self,
-        querystring: String,
-        parameters: Option<pyo3::Py<PyAny>>,
-        prepared: Option<bool>,
-    ) -> impl std::future::Future<Output = RustPSQLDriverPyResult<PSQLDriverPyQueryResult>> + Send;
-
-    fn psqlpy_query_simple(
-        &self,
-        querystring: String,
-    ) -> impl std::future::Future<Output = RustPSQLDriverPyResult<()>> + Send;
-}
-
-impl ObjectQueryTrait for PsqlpyConnection {
-    async fn psqlpy_query_one(
-        &self,
-        querystring: String,
-        parameters: Option<pyo3::Py<PyAny>>,
-        prepared: Option<bool>,
-    ) -> RustPSQLDriverPyResult<PSQLDriverSinglePyQueryResult> {
-        let mut params: Vec<PythonDTO> = vec![];
-        if let Some(parameters) = parameters {
-            params = convert_parameters(parameters)?;
-        }
-        let prepared = prepared.unwrap_or(true);
-
-        let result = if prepared {
-            self.query_one(
-                &self.prepare_cached(&querystring).await?,
-                &params
-                    .iter()
-                    .map(|param| param as &QueryParameter)
-                    .collect::<Vec<&QueryParameter>>()
-                    .into_boxed_slice(),
-            )
-            .await?
-        } else {
-            self.query_one(
-                &querystring,
-                &params
-                    .iter()
-                    .map(|param| param as &QueryParameter)
-                    .collect::<Vec<&QueryParameter>>()
-                    .into_boxed_slice(),
-            )
-            .await?
-        };
-
-        Ok(PSQLDriverSinglePyQueryResult::new(result))
-    }
-
-    async fn psqlpy_query(
-        &self,
-        querystring: String,
-        parameters: Option<pyo3::Py<PyAny>>,
-        prepared: Option<bool>,
-    ) -> RustPSQLDriverPyResult<PSQLDriverPyQueryResult> {
-        let mut params: Vec<PythonDTO> = vec![];
-        if let Some(parameters) = parameters {
-            params = convert_parameters(parameters)?;
-        }
-        let prepared = prepared.unwrap_or(true);
-
-        let result = if prepared {
-            self.query(
-                &self.prepare_cached(&querystring).await?,
-                &params
-                    .iter()
-                    .map(|param| param as &QueryParameter)
-                    .collect::<Vec<&QueryParameter>>()
-                    .into_boxed_slice(),
-            )
-            .await?
-        } else {
-            self.query(
-                &querystring,
-                &params
-                    .iter()
-                    .map(|param| param as &QueryParameter)
-                    .collect::<Vec<&QueryParameter>>()
-                    .into_boxed_slice(),
-            )
-            .await?
-        };
-
-        Ok(PSQLDriverPyQueryResult::new(result))
-    }
-
-    async fn psqlpy_query_simple(&self, querystring: String) -> RustPSQLDriverPyResult<()> {
-        self.batch_execute(querystring.as_str()).await
-    }
-}