Skip to content

Refactor execute-like methods #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chandr-andr merged 3 commits into from
Feb 8, 2025
Merged

Refactor execute-like methods #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d67dcb3
Small changes in doc
chandr-andr Jan 26, 2025
36eac82
Merge branch 'main' of github.com:qaspen-python/psqlpy
chandr-andr Feb 8, 2025
f2884d1
Refactored execute-like methods
chandr-andr Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/components/listener.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ async def main() -> None:
- `channel`: name of the channel to listen.
- `callback`: coroutine callback.

Add new callback to the channel, can be called more than 1 times.
Add new callback to the channel, can be called multiple times (before or after `listen`).

Callback signature is like this:
```python
Expand Down
110 changes: 1 addition & 109 deletions src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
}
}
Loading
Loading