Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/crazy-walls-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/sql-pg": patch
---

Fix crash when pool.connect fails by ensuring client exists before attaching error handler
40 changes: 26 additions & 14 deletions packages/sql-pg/src/PgClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,25 +315,37 @@ export const make = (
const fiber = Option.getOrThrow(Fiber.getCurrentFiber())
const scope = Context.unsafeGet(fiber.currentContext, Scope.Scope)
let cause: Error | undefined = undefined
function onError(cause_: Error) {
cause = cause_
}
pool.connect((err, client, release) => {
if (err) {
resume(Effect.fail(new SqlError({ cause: err, message: "Failed to acquire connection for transaction" })))
} else {
resume(Effect.as(
Scope.addFinalizer(
scope,
Effect.sync(() => {
client!.off("error", onError)
release(cause)
return
} else if (!client) {
resume(
Effect.fail(
new SqlError({
message: "Failed to acquire connection for transaction",
cause: new Error("No client returned")
})
),
client!
))
}
function onError(cause_: Error) {
cause = cause_
)
)
return
}
client!.on("error", onError)

// Else we know we have client defined, so we can proceed with the connection
client.on("error", onError)
resume(Effect.as(
Scope.addFinalizer(
scope,
Effect.sync(() => {
client.off("error", onError)
release(cause)
})
),
client
))
})
})
const reserve = Effect.map(reserveRaw, (client) => new ConnectionImpl(client))
Expand Down