mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-18 23:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(MySQL) (#22619)

Browse Source 
### What does this PR do?

### How did you verify your code works?

---------

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
Ciro Spaciari
2025-09-13 14:52:19 -07:00
committed by GitHub
parent 8e786c1cfc
commit beea7180f3
30 changed files with 2238 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/postgres/PostgresSQLConnection.zig
View File

@@ -219,7 +219,7 @@ pub fn onConnectionTimeout(this: *PostgresSQLConnection) bun.api.Timer.EventLoop
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {}", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
},
.sent_startup_message => {
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timed out after {} (sent startup message, but never received response)", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
this.failFmt("ERR_POSTGRES_CONNECTION_TIMEOUT", "Connection timeout after {} (sent startup message, but never received response)", .{bun.fmt.fmtDurationOneDecimal(@as(u64, this.connection_timeout_ms) *| std.time.ns_per_ms)});
},
}
return .disarm;
@@ -311,7 +311,7 @@ pub fn failWithJSValue(this: *PostgresSQLConnection, value: JSValue) void {
this.stopTimers();
if (this.status == .failed) return;
this.setStatus(.failed);
this.status = .failed;
this.ref();
defer this.deref();
@@ -321,12 +321,17 @@ pub fn failWithJSValue(this: *PostgresSQLConnection, value: JSValue) void {
const loop = this.vm.eventLoop();
loop.enter();
var js_error = value.toError() orelse value;
if (js_error == .zero) {
js_error = postgresErrorToJS(this.globalObject, "Connection closed", error.ConnectionClosed);
}
js_error.ensureStillAlive();
defer loop.exit();
_ = on_close.call(
this.globalObject,
this.js_value,
.js_undefined,
&[_]JSValue{
value.toError() orelse value,
js_error,
this.getQueriesArray(),
},
) catch |e| this.globalObject.reportActiveExceptionAsUnhandled(e);
@@ -1350,6 +1355,9 @@ fn advance(this: *PostgresSQLConnection) void {
}
pub fn getQueriesArray(this: *const PostgresSQLConnection) JSValue {
if (this.js_value.isEmptyOrUndefinedOrNull()) {
return .js_undefined;
}
return js.queriesGetCached(this.js_value) orelse .js_undefined;
}