diff --git a/src/sql/mysql/MySQLConnection.zig b/src/sql/mysql/MySQLConnection.zig index 9dd70556e7..094fe9411a 100644 --- a/src/sql/mysql/MySQLConnection.zig +++ b/src/sql/mysql/MySQLConnection.zig @@ -380,7 +380,7 @@ pub fn failWithJSValue(this: *MySQLConnection, value: JSValue) void { this.globalObject, .js_undefined, &[_]JSValue{ - value, + value.toError() orelse value, this.getQueriesArray(), }, ) catch |e| this.globalObject.reportActiveExceptionAsUnhandled(e); diff --git a/src/sql/mysql/MySQLQuery.zig b/src/sql/mysql/MySQLQuery.zig index 5072018601..0292743859 100644 --- a/src/sql/mysql/MySQLQuery.zig +++ b/src/sql/mysql/MySQLQuery.zig @@ -95,9 +95,7 @@ pub fn onWriteFail( const event_loop = vm.eventLoop(); event_loop.runCallback(function, globalObject, thisValue, &.{ targetValue, - // TODO: add mysql error to JS - // postgresErrorToJS(globalObject, null, err), - instance, + instance.toError() orelse instance, queries_array, }); } @@ -178,7 +176,7 @@ pub fn onJSError(this: *@This(), err: jsc.JSValue, globalObject: *jsc.JSGlobalOb const function = vm.rareData().mysql_context.onQueryRejectFn.get().?; const event_loop = vm.eventLoop(); event_loop.runCallback(function, globalObject, thisValue, &.{ - targetValue, + targetValue.toError() orelse targetValue, err, }); }