Skip to content

Commit c98ae53

Browse files
committed
Small fixes with kwargs parameters
1 parent 093d78c commit c98ae53

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

python/tests/test_kwargs_parameters.py

+9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ async def test_success_default_map_parameters(
2929

3030

3131
@pytest.mark.usefixtures("create_table_for_map_parameters_test")
32+
@pytest.mark.parametrize(
33+
"prepared",
34+
[
35+
True,
36+
False,
37+
],
38+
)
3239
async def test_success_multiple_same_parameters(
40+
prepared: bool,
3341
psql_pool: ConnectionPool,
3442
map_parameters_table_name: str,
3543
) -> None:
@@ -54,6 +62,7 @@ async def test_success_multiple_same_parameters(
5462
"WHERE name = $(name)p OR surname = $(name)p"
5563
),
5664
parameters={"name": test_name_surname},
65+
prepared=prepared,
5766
)
5867

5968
assert res.result()[0]["name"] == test_name_surname

src/statement/parameters.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ impl MappingParametersBuilder {
138138
types: Vec<Type>,
139139
) -> PSQLPyResult<PreparedParameters> {
140140
let extracted_parameters = self.extract_parameters(gil, parameters_names)?;
141-
let zipped_params_types = zip(extracted_parameters, types);
141+
let zipped_params_types = zip(extracted_parameters, &types);
142142
let converted_parameters = zipped_params_types
143143
.map(|(parameter, type_)| from_python_typed(parameter.bind(gil), &type_))
144144
.collect::<PSQLPyResult<Vec<PythonDTO>>>()?;
145145

146-
Ok(PreparedParameters::new(converted_parameters, vec![])) // TODO: change vec![] to real types.
146+
Ok(PreparedParameters::new(converted_parameters, types))
147147
}
148148

149149
fn prepare_not_typed(
@@ -157,7 +157,7 @@ impl MappingParametersBuilder {
157157
.map(|parameter| from_python_untyped(parameter.bind(gil)))
158158
.collect::<PSQLPyResult<Vec<PythonDTO>>>()?;
159159

160-
Ok(PreparedParameters::new(converted_parameters, vec![])) // TODO: change vec![] to real types.
160+
Ok(PreparedParameters::new(converted_parameters, vec![]))
161161
}
162162

163163
fn extract_parameters(
@@ -218,7 +218,7 @@ impl SequenceParametersBuilder {
218218
.map(|parameter| from_python_untyped(parameter.bind(gil)))
219219
.collect::<PSQLPyResult<Vec<PythonDTO>>>()?;
220220

221-
Ok(PreparedParameters::new(converted_parameters, vec![])) // TODO: change vec![] to real types.
221+
Ok(PreparedParameters::new(converted_parameters, vec![]))
222222
}
223223
}
224224

0 commit comments

Comments
 (0)