Skip to content

refactor(sqlite): add check_cursor_valid method for cursor state validation #6342

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
Dec 8, 2025
Merged

refactor(sqlite): add check_cursor_valid method for cursor state validation #6342

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
41 changes: 25 additions & 16 deletions crates/stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,26 +1589,35 @@ mod _sqlite {
Ok(())
}

fn inner(&self, vm: &VirtualMachine) -> PyResult<PyMappedMutexGuard<'_, CursorInner>> {
let guard = self.inner.lock();
if guard.is_some() {
let inner_guard =
PyMutexGuard::map(guard, |x| unsafe { x.as_mut().unwrap_unchecked() });
if inner_guard.closed {
return Err(new_programming_error(
vm,
"Cannot operate on a closed cursor.".to_owned(),
));
}
Ok(inner_guard)
} else {
Err(new_programming_error(
fn check_cursor_state(inner: Option<&CursorInner>, vm: &VirtualMachine) -> PyResult<()> {
match inner {
Some(inner) if inner.closed => Err(new_programming_error(
vm,
"Cannot operate on a closed cursor.".to_owned(),
)),
Some(_) => Ok(()),
None => Err(new_programming_error(
vm,
"Base Cursor.__init__ not called.".to_owned(),
))
)),
}
}

fn inner(&self, vm: &VirtualMachine) -> PyResult<PyMappedMutexGuard<'_, CursorInner>> {
let guard = self.inner.lock();
Self::check_cursor_state(guard.as_ref(), vm)?;
Ok(PyMutexGuard::map(guard, |x| unsafe {
x.as_mut().unwrap_unchecked()
}))
}

/// Check if cursor is valid without retaining the lock.
/// Use this when you only need to verify the cursor state but don't need to modify it.
fn check_cursor_valid(&self, vm: &VirtualMachine) -> PyResult<()> {
let guard = self.inner.lock();
Self::check_cursor_state(guard.as_ref(), vm)
}

#[pymethod]
fn execute(
zelf: PyRef<Self>,
Expand Down Expand Up @@ -1771,7 +1780,7 @@ mod _sqlite {
script: PyUtf8StrRef,
vm: &VirtualMachine,
) -> PyResult<PyRef<Self>> {
let _ = zelf.clone().inner(vm)?;
zelf.check_cursor_valid(vm)?;

let db = zelf.connection.db_lock(vm)?;

Expand Down
Loading