X Tutup
Skip to content

sqlite3: fix Connection.cursor() factory argument handling #6783

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
youknowone merged 1 commit into from
Jan 18, 2026
Merged

sqlite3: fix Connection.cursor() factory argument handling #6783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Lib/test/test_sqlite3/test_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ def setUp(self):
def tearDown(self):
self.con.close()

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_is_instance(self):
cur = self.con.cursor()
self.assertIsInstance(cur, sqlite.Cursor)
Expand Down
37 changes: 25 additions & 12 deletions crates/stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,12 @@ mod _sqlite {
name: PyStrRef,
}

#[derive(FromArgs)]
struct CursorArgs {
#[pyarg(any, default)]
factory: OptionalArg<PyObjectRef>,
}

struct CallbackData {
obj: NonNull<PyObject>,
vm: *const VirtualMachine,
Expand Down Expand Up @@ -1023,22 +1029,29 @@ mod _sqlite {
#[pymethod]
fn cursor(
zelf: PyRef<Self>,
factory: OptionalArg<ArgCallable>,
args: CursorArgs,
vm: &VirtualMachine,
) -> PyResult<PyRef<Cursor>> {
) -> PyResult<PyObjectRef> {
zelf.db_lock(vm).map(drop)?;

let cursor = if let OptionalArg::Present(factory) = factory {
let cursor = factory.invoke((zelf.clone(),), vm)?;
let cursor = cursor.downcast::<Cursor>().map_err(|x| {
vm.new_type_error(format!("factory must return a cursor, not {}", x.class()))
})?;
let _ = unsafe { cursor.row_factory.swap(zelf.row_factory.to_owned()) };
cursor
} else {
let row_factory = zelf.row_factory.to_owned();
Cursor::new(zelf, row_factory, vm).into_ref(&vm.ctx)
let factory = match args.factory {
OptionalArg::Present(f) => f,
OptionalArg::Missing => Cursor::class(&vm.ctx).to_owned().into(),
};

let cursor = factory.call((zelf.clone(),), vm)?;

if !cursor.class().fast_issubclass(Cursor::class(&vm.ctx)) {
return Err(vm.new_type_error(format!(
"factory must return a cursor, not {}",
cursor.class()
)));
}

if let Some(cursor_ref) = cursor.downcast_ref::<Cursor>() {
let _ = unsafe { cursor_ref.row_factory.swap(zelf.row_factory.to_owned()) };
}

Ok(cursor)
}

Expand Down
Loading
X Tutup