Skip to content

Commit b5bfec2

Browse files
committed
Full value converter refactor
1 parent 284cc34 commit b5bfec2

File tree

2 files changed

+1
-39
lines changed

2 files changed

+1
-39
lines changed

src/driver/inner_connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use bytes::Buf;
2-
use deadpool_postgres::{Object, Pool};
2+
use deadpool_postgres::Object;
33
use postgres_types::{ToSql, Type};
44
use pyo3::{Py, PyAny, Python};
55
use std::vec;

src/value_converter/to_python.rs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -635,41 +635,3 @@ pub fn postgres_to_py(
635635
}
636636
Ok(py.None())
637637
}
638-
639-
/// Convert Python sequence to Rust vector.
640-
/// Also it checks that sequence has set/list/tuple type.
641-
///
642-
/// # Errors
643-
///
644-
/// May return error if cannot convert Python type into Rust one.
645-
/// May return error if parameters type isn't correct.
646-
fn py_sequence_to_rust(bind_parameters: &Bound<PyAny>) -> PSQLPyResult<Vec<Py<PyAny>>> {
647-
let mut coord_values_sequence_vec: Vec<Py<PyAny>> = vec![];
648-
649-
if bind_parameters.is_instance_of::<PySet>() {
650-
let bind_pyset_parameters = bind_parameters.downcast::<PySet>().unwrap();
651-
652-
for one_parameter in bind_pyset_parameters {
653-
let extracted_parameter = one_parameter.extract::<Py<PyAny>>().map_err(|_| {
654-
RustPSQLDriverError::PyToRustValueConversionError(
655-
format!("Error on sequence type extraction, please use correct list/tuple/set, {bind_parameters}")
656-
)
657-
})?;
658-
coord_values_sequence_vec.push(extracted_parameter);
659-
}
660-
} else if bind_parameters.is_instance_of::<PyList>()
661-
| bind_parameters.is_instance_of::<PyTuple>()
662-
{
663-
coord_values_sequence_vec = bind_parameters.extract::<Vec<Py<PyAny>>>().map_err(|_| {
664-
RustPSQLDriverError::PyToRustValueConversionError(
665-
format!("Error on sequence type extraction, please use correct list/tuple/set, {bind_parameters}")
666-
)
667-
})?;
668-
} else {
669-
return Err(RustPSQLDriverError::PyToRustValueConversionError(format!(
670-
"Invalid sequence type, please use list/tuple/set, {bind_parameters}"
671-
)));
672-
};
673-
674-
Ok::<Vec<Py<PyAny>>, RustPSQLDriverError>(coord_values_sequence_vec)
675-
}

0 commit comments

Comments
 (0)