Skip to content

sqlite3: Support 'size' keyword argument in Cursor::fetchmany #6118

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
coolreader18 merged 2 commits into from
Sep 1, 2025
Merged

sqlite3: Support 'size' keyword argument in Cursor::fetchmany #6118

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b194a
sqlite3: Support 'size' keyword argument in `Cursor::fetchmany`
ever0de Sep 1, 2025
2e16f51
use `FromArgs`
ever0de Sep 1, 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
Prev Previous commit
use FromArgs
  • Loading branch information
@ever0de
ever0de committed Sep 1, 2025
commit 2e16f51c68dde8d8c0f79d5745b874ea043f762e
39 changes: 11 additions & 28 deletions stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,12 @@ mod _sqlite {
statement: Option<PyRef<Statement>>,
}

#[derive(FromArgs)]
struct FetchManyArgs {
#[pyarg(any, name = "size", optional)]
size: Option<c_int>,
}

#[pyclass(with(Constructor, IterNext, Iterable), flags(BASETYPE))]
impl Cursor {
fn new(
Expand Down Expand Up @@ -1684,38 +1690,15 @@ mod _sqlite {
#[pymethod]
fn fetchmany(
zelf: &Py<Self>,
mut args: FuncArgs,
args: FetchManyArgs,
vm: &VirtualMachine,
) -> PyResult<Vec<PyObjectRef>> {
let size_posarg = args.take_positional();
let size_kwarg = args.take_keyword("size");

if !args.args.is_empty() {
return Err(vm.new_type_error(format!(
"fetchmany() takes from 0 to 1 positional arguments but {} were given",
args.args.len() + 1
)));
}

if let Some((name_str, _)) = args.kwargs.into_iter().next() {
return Err(vm.new_type_error(format!(
"fetchmany() got an unexpected keyword argument {name_str}",
)));
}

let max_rows: c_int = match (size_posarg, size_kwarg) {
(Some(pos), None) => pos.try_into_value(vm)?,
(None, Some(kw)) => kw.try_into_value(vm)?,
(None, None) => zelf.arraysize.load(Ordering::Relaxed),
(Some(_), Some(_)) => {
return Err(vm.new_type_error(
"fetchmany() got multiple values for argument 'size'".to_owned(),
));
}
};
let max_rows = args
.size
.unwrap_or_else(|| zelf.arraysize.load(Ordering::Relaxed));

let mut list = vec![];
while let PyIterReturn::Return(row) = Self::next(zelf, vm)? {
while let PyIterReturn::Return(row) = Cursor::next(zelf, vm)? {
list.push(row);
if max_rows > 0 && list.len() as c_int >= max_rows {
break;
Expand Down
Loading