Skip to content

sqlite: allow passing conflict resolution handler function #56352

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
nodejs-github-bot merged 12 commits into from
Dec 29, 2024
Merged

sqlite: allow passing conflict resolution handler function #56352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3635cd9
sqlite: pass conflict type to conflict resolution handler
louwers Dec 24, 2024
e6001b3
sqlite: improve error message when applying changeset fails
louwers Dec 24, 2024
a06a068
sqlite: handle exception thrown in conflict handler
louwers Dec 24, 2024
5d2fc4e
sqlite: avoid coercion when returning invalid value from conflict han…
louwers Dec 28, 2024
a45e4c0
sqlite: remove redundant header
louwers Dec 28, 2024
c4a03b5
doc: sqlite documentation improvements
louwers Dec 28, 2024
c674327
sqlite: improve error handling
louwers Dec 28, 2024
7ccdfd1
sqlite: add test returning Promise from conflict handler
louwers Dec 28, 2024
df86bb1
sqlite: fix error code key and add test
louwers Dec 28, 2024
eb1936b
sqlite: formatting
louwers Dec 28, 2024
9b4255c
sqlite: fix error message test
louwers Dec 28, 2024
5e39d22
doc: sort references
louwers Dec 28, 2024
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
sqlite: improve error handling
  • Loading branch information
@louwers
louwers committed Dec 28, 2024
commit c674327ade01df4c548f0b2c33b12c992739f991
5 changes: 4 additions & 1 deletion src/env_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,13 @@
V(entry_type_string, "entryType") \
V(env_pairs_string, "envPairs") \
V(env_var_settings_string, "envVarSettings") \
V(err_sqlite_error_string, "ERR_SQLITE_ERROR") \
V(errcode_string, "errcode") \
V(errno_string, "errno") \
V(error_string, "error") \
V(events, "events") \
V(errstr_string, "errstr") \
V(events_waiting, "eventsWaiting") \
V(events, "events") \
V(exchange_string, "exchange") \
V(expire_string, "expire") \
V(exponent_string, "exponent") \
Expand Down
25 changes: 13 additions & 12 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@ inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
const char* message) {
Local<String> js_msg;
Local<Object> e;
Environment* env = Environment::GetCurrent(isolate);
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
!Exception::Error(js_msg)
->ToObject(isolate->GetCurrentContext())
.ToLocal(&e) ||
e->Set(isolate->GetCurrentContext(),
OneByteString(isolate, "code"),
OneByteString(isolate, "ERR_SQLITE_ERROR"))
env->error_string(),
env->err_sqlite_error_string())
.IsNothing()) {
return MaybeLocal<Object>();
}
Expand All @@ -86,14 +87,15 @@ inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
const char* errmsg = sqlite3_errmsg(db);
Local<String> js_errmsg;
Local<Object> e;
Environment* env = Environment::GetCurrent(isolate);
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
!CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
e->Set(isolate->GetCurrentContext(),
OneByteString(isolate, "errcode"),
env->errcode_string(),
Integer::New(isolate, errcode))
.IsNothing() ||
e->Set(isolate->GetCurrentContext(),
OneByteString(isolate, "errstr"),
env->errstr_string(),
js_errmsg)
.IsNothing()) {
return MaybeLocal<Object>();
Expand All @@ -117,15 +119,14 @@ inline void THROW_ERR_SQLITE_ERROR(Isolate* isolate, const char* message) {

inline void THROW_ERR_SQLITE_ERROR(Isolate* isolate, int errcode) {
const char* errstr = sqlite3_errstr(errcode);
Local<Object> e;

if (CreateSQLiteError(isolate, errstr).ToLocal(&e)) {
e->Set(isolate->GetCurrentContext(),
OneByteString(isolate, "errcode"),
Integer::New(isolate, errcode))
.IsNothing();
isolate->ThrowException(e);
}
Environment* env = Environment::GetCurrent(isolate);
auto error = CreateSQLiteError(isolate, errstr).ToLocalChecked();
error->Set(isolate->GetCurrentContext(),
env->errcode_string(),
Integer::New(isolate, errcode))
.ToChecked();
isolate->ThrowException(error);
}

class UserDefinedFunction {
Expand Down