nodejs
diff --git a/‎src/node_sqlite.cc‎
Lines changed: 4 additions & 1 deletion b/‎src/node_sqlite.cc‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎test/parallel/test-sqlite-aggregate-function.mjs‎
Lines changed: 21 additions & 0 deletions b/‎test/parallel/test-sqlite-aggregate-function.mjs‎
Lines changed: 21 additions & 0 deletions
@@ -375,7 +375,10 @@ class CustomAggregate {
       result = Local<Value>::New(isolate, agg->value);
     }
 
-    JSValueToSQLiteResult(isolate, ctx, result);
+    if (!result.IsEmpty()) {
+      JSValueToSQLiteResult(isolate, ctx, result);
+    }
+
     if (is_final) {
       DestroyAggregateData(ctx);
     }
 
@@ -309,6 +309,27 @@ describe('step', () => {
 });
 
 describe('result', () => {
+  test('throws if result throws an error', (t) => {
+    const db = new DatabaseSync(':memory:');
+    t.after(() => db.close());
+    db.exec('CREATE TABLE data (value INTEGER)');
+    db.exec('INSERT INTO data VALUES (1), (2), (3)');
+    db.aggregate('sum_int', {
+      start: 0,
+      step: (acc, value) => {
+        return acc + value;
+      },
+      result: () => {
+        throw new Error('result error');
+      },
+    });
+    t.assert.throws(() => {
+      db.prepare('SELECT sum_int(value) as result FROM data').get();
+    }, {
+      message: 'result error'
+    });
+  });
+
   test('executes once when options.inverse is not present', (t) => {
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
Original file line number	Diff line number	Diff line change
@@ -375,7 +375,10 @@ class CustomAggregate {
375	375	result = Local<Value>::New(isolate, agg->value);
376	376	}
377	377
378		- JSValueToSQLiteResult(isolate, ctx, result);
	378	+ if (!result.IsEmpty()) {
	379	+ JSValueToSQLiteResult(isolate, ctx, result);
	380	+ }
	381	+
379	382	if (is_final) {
380	383	DestroyAggregateData(ctx);
381	384	}