Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"opargs",
"pointee",
"pyc",
"qmark",
"reborrow",
"reborrows",
"reparenting",
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_sqlite3/test_dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@ def __getitem__(slf, x):
with self.assertRaises(ZeroDivisionError):
self.cu.execute("select name from test where name=?", L())

@unittest.expectedFailure # TODO: RUSTPYTHON; mixed named and positional parameters not validated
def test_execute_named_param_and_sequence(self):
dataset = (
("select :a", (1,)),
Expand Down
10 changes: 10 additions & 0 deletions crates/stdlib/src/_sqlite3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3203,6 +3203,16 @@ mod _sqlite3 {
}

for i in 1..=num_needed {
let name = unsafe { sqlite3_bind_parameter_name(self.st, i) };
if !name.is_null() && unsafe { *name } != b'?' as libc::c_char {
let name_str = ptr_to_str(name, vm)?;
return Err(new_programming_error(
vm,
format!(
"Binding {i} ('{name_str}') is a named parameter, but you supplied a sequence which requires nameless (qmark) placeholders."
),
));
}
let val = seq.get_item(i as isize - 1, vm)?;
self.bind_parameter(i, &val, vm)?;
}
Expand Down
Loading