Skip to content

Fix sqlite connection reinitialization #6288

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 7 commits into from
Nov 22, 2025
Merged

Fix sqlite connection reinitialization #6288

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f47839b
Fix sqlite connection reinitialization
ever0de Nov 21, 2025
b3d45ae
Align sqlite connection reinit with CPython
ever0de Nov 21, 2025
216ab89
Enable sqlite test_connection_bad_reinit
ever0de Nov 21, 2025
5150186
Fix sqlite reinit flag without threading
ever0de Nov 21, 2025
b2f3adf
Update crates/stdlib/src/sqlite.rs
youknowone Nov 22, 2025
ece048d
Use stronger memory ordering for initialized flag synchronization
ever0de Nov 22, 2025
c9fc8a7
Auto-format code [skip ci]
github-actions[bot] Nov 22, 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
Next Next commit
Align sqlite connection reinit with CPython
  • Loading branch information
@ever0de
ever0de committed Nov 21, 2025
commit b3d45aebac5a2bac5757be78245d0adcf431d6b6
31 changes: 22 additions & 9 deletions crates/stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ mod _sqlite {
#[derive(PyPayload)]
struct Connection {
db: PyMutex<Option<Sqlite>>,
initialized: PyAtomic<bool>,
detect_types: PyAtomic<c_int>,
isolation_level: PyAtomicRef<Option<PyStr>>,
check_same_thread: PyAtomic<bool>,
Expand Down Expand Up @@ -865,8 +866,11 @@ mod _sqlite {
None
};

let initialized = db.is_some();

let conn = Self {
db: PyMutex::new(db),
initialized: Radium::new(initialized),
detect_types: Radium::new(args.detect_types),
isolation_level: PyAtomicRef::from(args.isolation_level),
check_same_thread: Radium::new(args.check_same_thread),
Expand Down Expand Up @@ -899,16 +903,14 @@ mod _sqlite {
type Args = ConnectArgs;

fn init(zelf: PyRef<Self>, args: Self::Args, vm: &VirtualMachine) -> PyResult<()> {
{
// Always drop the current database handle so __init__ can fully reconfigure it.
let mut guard = zelf.db.lock();
guard.take();
}
let was_initialized = zelf.initialized.swap(false, Ordering::Relaxed);

// Reset factories to their defaults, matching CPython's behavior.
let default_text_factory = PyStr::class(&vm.ctx).to_owned().into_object();
let _ = unsafe { zelf.row_factory.swap(None) };
let _ = unsafe { zelf.text_factory.swap(default_text_factory) };
zelf.reset_factories(vm);

if was_initialized {
zelf.drop_db();
}

// Attempt to open the new database before mutating other state so failures leave
// the connection uninitialized (and subsequent operations raise ProgrammingError).
Expand All @@ -929,12 +931,23 @@ mod _sqlite {

let mut guard = zelf.db.lock();
*guard = Some(db);
zelf.initialized.store(true, Ordering::Relaxed);
Ok(())
}
}

#[pyclass(with(Constructor, Callable, Initializer), flags(BASETYPE))]
impl Connection {
fn drop_db(&self) {
self.db.lock().take();
}

fn reset_factories(&self, vm: &VirtualMachine) {
let default_text_factory = PyStr::class(&vm.ctx).to_owned().into_object();
let _ = unsafe { self.row_factory.swap(None) };
let _ = unsafe { self.text_factory.swap(default_text_factory) };
}

fn initialize_db(args: &ConnectArgs, vm: &VirtualMachine) -> PyResult<Sqlite> {
let path = args.database.to_cstring(vm)?;
let db = Sqlite::from(SqliteRaw::open(path.as_ptr(), args.uri, vm)?);
Expand Down Expand Up @@ -1025,7 +1038,7 @@ mod _sqlite {
#[pymethod]
fn close(&self, vm: &VirtualMachine) -> PyResult<()> {
self.check_thread(vm)?;
self.db.lock().take();
self.drop_db();
Ok(())
}

Expand Down