Skip to content

Fix Windows SQLITE_CANTOPEN by using native path format #6110

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

Open
penalosa wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Fix Windows SQLITE_CANTOPEN by using native path format #6110

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
7 changes: 4 additions & 3 deletions src/workerd/util/sqlite.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,16 +508,17 @@ void SqliteDatabase::init(kj::Maybe<kj::WriteMode> maybeMode) {
KJ_IF_SOME(rootedPath, vfs.tryAppend(path)) {
// If we can get the path rooted in the VFS's directory, use the system's default VFS instead
// TODO(bug): This doesn't honor vfs.options. (This branch is only used on Windows.)
SQLITE_CALL_NODB(sqlite3_open_v2(rootedPath.toString().cStr(), &db, flags, nullptr));
SQLITE_CALL_NODB(
sqlite3_open_v2(rootedPath.toNativeString(true).cStr(), &db, flags, nullptr));
} else {
SQLITE_CALL_NODB(sqlite3_open_v2(path.toString().cStr(), &db, flags, vfs.getName().cStr()));
}
} else {
KJ_IF_SOME(rootedPath, vfs.tryAppend(path)) {
// If we can get the path rooted in the VFS's directory, use the system's default VFS instead
// TODO(bug): This doesn't honor vfs.options. (This branch is only used on Windows.)
SQLITE_CALL_NODB(
sqlite3_open_v2(rootedPath.toString().cStr(), &db, SQLITE_OPEN_READONLY, nullptr));
SQLITE_CALL_NODB(sqlite3_open_v2(
rootedPath.toNativeString(true).cStr(), &db, SQLITE_OPEN_READONLY, nullptr));
} else {
SQLITE_CALL_NODB(
sqlite3_open_v2(path.toString().cStr(), &db, SQLITE_OPEN_READONLY, vfs.getName().cStr()));
Expand Down
Loading