sqlite: improve error message when applying changeset fails

nodejs · Dec 24, 2024 · e6001b3 · e6001b3
1 parent 3635cd9
commit e6001b3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
@@ -114,6 +114,19 @@ 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);
+  }
+}
+
 class UserDefinedFunction {
  public:
   explicit UserDefinedFunction(Environment* env,
@@ -824,12 +837,16 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
       xFilter,
       xConflict,
       nullptr);
+  if (r == SQLITE_OK) {
+    args.GetReturnValue().Set(true);
+    return;
+  }
   if (r == SQLITE_ABORT) {
+    // this is not an error, return false
     args.GetReturnValue().Set(false);
     return;
   }
-  CHECK_ERROR_OR_THROW(env->isolate(), db->connection_, r, SQLITE_OK, void());
-  args.GetReturnValue().Set(true);
+  THROW_ERR_SQLITE_ERROR(env->isolate(), r);
 }
 
 void DatabaseSync::EnableLoadExtension(

diff --git a/test/parallel/test-sqlite-session.js b/test/parallel/test-sqlite-session.js
@@ -322,6 +322,20 @@ suite('conflict resolution', () => {
     t.assert.strictEqual(conflictType, constants.SQLITE_CHANGESET_CONSTRAINT);
     deepStrictEqual(t)(database2.prepare('SELECT key, value from data').all(), [{ key: 2, value: 'hello' }]);
   });
+
+  test("conflict resolution handler returns invalid value", (t) => {
+    const { database2, changeset } = prepareConflict();
+    t.assert.throws(() => {
+      database2.applyChangeset(changeset, {
+        onConflict: () => {
+          return -1;
+        }
+      });
+    }, {
+      name: 'Error',
+      message: 'bad parameter or other API misuse'
+    });
+  });
 });
 
 test('database.createSession() - filter changes', (t) => {