Skip to content

Fix sqlite Connection initialization check #6199

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 2 commits into from
Oct 21, 2025
Merged

Fix sqlite Connection initialization check #6199

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38e9fc5
Fix sqlite3 Connection initialization check
ever0de Oct 20, 2025
df09182
use Initializer trait
ever0de Oct 21, 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 Initializer trait
  • Loading branch information
@ever0de
ever0de committed Oct 21, 2025
commit df09182b7785d12eb9f10d243fbebd8c4453fe5f
35 changes: 19 additions & 16 deletions stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ mod _sqlite {
},
sliceable::{SaturatedSliceIter, SliceableSequenceOp},
types::{
AsMapping, AsNumber, AsSequence, Callable, Comparable, Constructor, Hashable, IterNext,
Iterable, PyComparisonOp, SelfIter, Unconstructible,
AsMapping, AsNumber, AsSequence, Callable, Comparable, Constructor, Hashable,
Initializer, IterNext, Iterable, PyComparisonOp, SelfIter, Unconstructible,
},
utils::ToCString,
};
Expand Down Expand Up @@ -895,7 +895,23 @@ mod _sqlite {
}
}

#[pyclass(with(Constructor, Callable), flags(BASETYPE))]
impl Initializer for Connection {
type Args = ConnectArgs;

fn init(zelf: PyRef<Self>, args: Self::Args, vm: &VirtualMachine) -> PyResult<()> {
let mut guard = zelf.db.lock();
if guard.is_some() {
// Already initialized
return Ok(());
}

let db = Self::initialize_db(&args, vm)?;
*guard = Some(db);
Ok(())
}
}

#[pyclass(with(Constructor, Callable, Initializer), flags(BASETYPE))]
impl Connection {
fn initialize_db(args: &ConnectArgs, vm: &VirtualMachine) -> PyResult<Sqlite> {
let path = args.database.to_cstring(vm)?;
Expand All @@ -908,19 +924,6 @@ mod _sqlite {
Ok(db)
}

#[pymethod]
fn __init__(&self, args: ConnectArgs, vm: &VirtualMachine) -> PyResult<()> {
let mut guard = self.db.lock();
if guard.is_some() {
// Already initialized
return Ok(());
}

let db = Self::initialize_db(&args, vm)?;
*guard = Some(db);
Ok(())
}

fn db_lock(&self, vm: &VirtualMachine) -> PyResult<PyMappedMutexGuard<'_, Sqlite>> {
self.check_thread(vm)?;
self._db_lock(vm)
Expand Down
Loading