Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .opencode/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"@opencode-ai/plugin": "1.2.24"
"@opencode-ai/plugin": "1.2.26"
}
}
3 changes: 2 additions & 1 deletion src/workerd/util/sqlite.c++
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ constexpr size_t RA_MAX_METRICS_QUERY_SIZE = 1024;

kj::String dbErrorMessage(int errorCode, sqlite3* db) {
kj::StringTree msg = kj::strTree(sqlite3_errmsg(db));
auto extendedErrorMessage = sqlite3_extended_errcode(db);
if (int offset = sqlite3_error_offset(db); offset != -1) {
msg = kj::strTree(kj::mv(msg), " at offset ", offset);
}
msg = kj::strTree(kj::mv(msg), ": ", namedErrorCode(errorCode));
msg = kj::strTree(kj::mv(msg), ": ", namedErrorCode(errorCode), "- ", extendedErrorMessage);
Comment on lines +90 to +94
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few issues with these lines:

  1. sqlite3_extended_errcode() returns an int, but the variable is named extendedErrorMessage — this is misleading.
  2. The extended error code is appended as a raw integer, which isn't very useful for debugging. The codebase already uses sqlite3_errstr() elsewhere (e.g., in SQLITE_CALL_NODB) which handles extended codes and returns a human-readable string.
  3. There's a missing space before the dash: "- " should be " - " (or use " (extended: ...)" to clearly delineate it).
  4. When there is no extended info, sqlite3_extended_errcode() returns the same value as the primary code, so you'd get redundant output like SQLITE_ERROR - SQLITE_ERROR. Consider only appending when the extended code differs from the primary code.
Suggested change
auto extendedErrorMessage = sqlite3_extended_errcode(db);
if (int offset = sqlite3_error_offset(db); offset != -1) {
msg = kj::strTree(kj::mv(msg), " at offset ", offset);
}
msg = kj::strTree(kj::mv(msg), ": ", namedErrorCode(errorCode));
msg = kj::strTree(kj::mv(msg), ": ", namedErrorCode(errorCode), "- ", extendedErrorMessage);
auto extendedErrorCode = sqlite3_extended_errcode(db);
if (int offset = sqlite3_error_offset(db); offset != -1) {
msg = kj::strTree(kj::mv(msg), " at offset ", offset);
}
msg = kj::strTree(kj::mv(msg), ": ", namedErrorCode(errorCode));
if (extendedErrorCode != errorCode) {
msg = kj::strTree(kj::mv(msg), " (extended: ", sqlite3_errstr(extendedErrorCode), ")");
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good review, Bonk.

return msg.flatten();
}

Expand Down
Loading