@effect/sql-pg 4.0.0-beta.7 → 4.0.0-beta.71

package/src/PgClient.ts

@@ -1,25 +1,76 @@
 /**
- * @since 1.0.0
+ * PostgreSQL driver for Effect SQL, backed by the `pg` package.
+ *
+ * Use this module to provide a {@link PgClient} and the generic `SqlClient`
+ * service from pool settings, a single managed `pg.Client`, an existing
+ * `pg.Pool`, or custom connection acquirers. The client uses Effect SQL's
+ * PostgreSQL compiler, classifies common PostgreSQL failures as `SqlError`s,
+ * and adds PostgreSQL-specific JSON fragments plus LISTEN/NOTIFY operations.
+ *
+ * ## Mental model
+ *
+ * Pool-backed clients acquire a connection for each operation. Transactions and
+ * cursor streams keep a dedicated connection for their scope, so they consume
+ * pool capacity while active. Clients built from one `pg.Client` serialize
+ * query access through that client; set `acquireForStream` in
+ * {@link makeClient} when streams or listeners need separate clients.
+ *
+ * ## Common tasks
+ *
+ * - Use {@link layer} with concrete pool settings, or {@link layerConfig} when
+ *   settings should come from `Config`.
+ * - Use {@link make} for a scoped pool-backed client without immediately
+ *   turning it into a layer.
+ * - Use {@link fromPool} or {@link fromClient} when another component owns
+ *   acquisition of the underlying `pg` resources.
+ * - Use `client.json`, `client.listen`, and `client.notify` for
+ *   PostgreSQL-specific values and notifications.
+ *
+ * ## Gotchas
+ *
+ * LISTEN opens a scoped long-lived client and issues `UNLISTEN` when the stream
+ * scope closes, so keep listener streams scoped for exactly the period
+ * notifications are needed. Long-running transactions, streams, and listeners
+ * can hold onto database connections even while other fibers continue to use
+ * the same `PgClient`.
+ *
+ * @since 4.0.0
  */
 import * as Arr from "effect/Array"
 import * as Cause from "effect/Cause"
 import * as Channel from "effect/Channel"
 import * as Config from "effect/Config"
+import * as Context from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as Layer from "effect/Layer"
 import * as Number from "effect/Number"
+import * as Option from "effect/Option"
 import * as Queue from "effect/Queue"
 import * as RcRef from "effect/RcRef"
 import * as Redacted from "effect/Redacted"
 import * as Scope from "effect/Scope"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Semaphore from "effect/Semaphore"
 import * as Stream from "effect/Stream"
 import * as Reactivity from "effect/unstable/reactivity/Reactivity"
 import * as Client from "effect/unstable/sql/SqlClient"
 import type { Connection } from "effect/unstable/sql/SqlConnection"
-import { SqlError } from "effect/unstable/sql/SqlError"
+import type * as SqlConnection from "effect/unstable/sql/SqlConnection"
+import {
+  AuthenticationError,
+  AuthorizationError,
+  ConnectionError,
+  ConstraintError,
+  DeadlockError,
+  LockTimeoutError,
+  SerializationError,
+  SqlError,
+  SqlSyntaxError,
+  StatementTimeoutError,
+  UniqueViolation,
+  UnknownError
+} from "effect/unstable/sql/SqlError"
 import type { Custom, Fragment } from "effect/unstable/sql/Statement"
 import * as Statement from "effect/unstable/sql/Statement"
 import type { Duplex } from "node:stream"
@@ -28,26 +79,27 @@ import * as Pg from "pg"
 import * as PgConnString from "pg-connection-string"
 import Cursor from "pg-cursor"
 
-const ATTR_DB_SYSTEM_NAME = "db.system.name"
-const ATTR_DB_NAMESPACE = "db.namespace"
-const ATTR_SERVER_ADDRESS = "server.address"
-const ATTR_SERVER_PORT = "server.port"
-
 /**
- * @category type ids
- * @since 1.0.0
+ * Runtime type identifier used to mark `PgClient` values.
+ *
+ * @category type IDs
+ * @since 4.0.0
  */
 export const TypeId: TypeId = "~@effect/sql-pg/PgClient"
 
 /**
- * @category type ids
- * @since 1.0.0
+ * Type-level identifier used to mark `PgClient` values.
+ *
+ * @category type IDs
+ * @since 4.0.0
  */
 export type TypeId = "~@effect/sql-pg/PgClient"
 
 /**
+ * PostgreSQL client service, extending `SqlClient` with JSON parameter fragments and LISTEN/NOTIFY helpers.
+ *
  * @category models
- * @since 1.0.0
+ * @since 4.0.0
  */
 export interface PgClient extends Client.SqlClient {
   readonly [TypeId]: TypeId
@@ -58,14 +110,18 @@ export interface PgClient extends Client.SqlClient {
 }
 
 /**
+ * Context tag used to access the `PgClient` service.
+ *
  * @category tags
- * @since 1.0.0
+ * @since 4.0.0
  */
-export const PgClient = ServiceMap.Service<PgClient>("@effect/sql-pg/PgClient")
+export const PgClient = Context.Service<PgClient>("@effect/sql-pg/PgClient")
 
 /**
+ * Configuration for a PostgreSQL client, including connection, TLS, custom stream, application name, type parser, JSON transform, and query/result name transform options.
+ *
  * @category constructors
- * @since 1.0.0
+ * @since 4.0.0
  */
 export interface PgClientConfig {
   readonly url?: Redacted.Redacted | undefined
@@ -78,14 +134,9 @@ export interface PgClientConfig {
   readonly username?: string | undefined
   readonly password?: Redacted.Redacted | undefined
 
-  readonly stream?: (() => Duplex) | undefined
-
-  readonly idleTimeout?: Duration.Input | undefined
   readonly connectTimeout?: Duration.Input | undefined
 
-  readonly maxConnections?: number | undefined
-  readonly minConnections?: number | undefined
-  readonly connectionTTL?: Duration.Input | undefined
+  readonly stream?: (() => Duplex) | undefined
 
   readonly applicationName?: string | undefined
   readonly spanAttributes?: Record<string, unknown> | undefined
@@ -97,12 +148,26 @@ export interface PgClientConfig {
 }
 
 /**
+ * PostgreSQL pool configuration, extending `PgClientConfig` with idle timeout, pool size, and connection lifetime settings.
+ *
  * @category constructors
- * @since 1.0.0
+ * @since 4.0.0
  */
-export const make = (
-  options: PgClientConfig
-): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
+export interface PgPoolConfig extends PgClientConfig {
+  readonly idleTimeout?: Duration.Input | undefined
+
+  readonly maxConnections?: number | undefined
+  readonly minConnections?: number | undefined
+  readonly connectionTTL?: Duration.Input | undefined
+}
+
+/**
+ * Creates a scoped PostgreSQL client backed by a managed `pg` connection pool.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = (options: PgPoolConfig): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
   fromPool({
     ...options,
     acquire: Effect.gen(function*() {
@@ -135,20 +200,24 @@ export const make = (
       yield* Effect.acquireRelease(
         Effect.tryPromise({
           try: () => pool.query("SELECT 1"),
-          catch: (cause) => new SqlError({ cause, message: "PgClient: Failed to connect" })
+          catch: (cause) => new SqlError({ reason: classifyError(cause, "PgClient: Failed to connect", "connect") })
         }),
         () =>
           Effect.promise(() => pool.end()).pipe(
             Effect.timeoutOption(1000)
-          )
+          ),
+        { interruptible: true }
       ).pipe(
         Effect.timeoutOrElse({
           duration: options.connectTimeout ?? Duration.seconds(5),
-          onTimeout: () =>
+          orElse: () =>
             Effect.fail(
               new SqlError({
-                cause: new Error("Connection timed out"),
-                message: "PgClient: Connection timed out"
+                reason: new ConnectionError({
+                  cause: new Error("Connection timed out"),
+                  message: "PgClient: Connection timed out",
+                  operation: "connect"
+                })
               })
             )
         })
@@ -159,8 +228,70 @@ export const make = (
   })
 
 /**
+ * Creates a scoped PostgreSQL client backed by a managed single `pg` client, optionally acquiring a separate client for streaming and LISTEN operations.
+ *
  * @category constructors
- * @since 1.0.0
+ * @since 4.0.0
+ */
+export const makeClient = (
+  options: PgClientConfig & {
+    /**
+     * Whether to acquire a separate client for each sql.stream / sql.listen
+     */
+    readonly acquireForStream?: boolean | undefined
+  }
+): Effect.Effect<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
+  fromClient({
+    ...options,
+    acquire: Effect.gen(function*() {
+      const client = new Pg.Client({
+        connectionString: options.url ? Redacted.value(options.url) : undefined,
+        user: options.username,
+        host: options.host,
+        database: options.database,
+        password: options.password ? Redacted.value(options.password) : undefined,
+        ssl: options.ssl,
+        port: options.port,
+        ...(options.stream ? { stream: options.stream } : {}),
+        application_name: options.applicationName ?? "@effect/sql-pg",
+        types: options.types
+      })
+      yield* Effect.acquireRelease(
+        Effect.tryPromise({
+          try: () => client.query("SELECT 1"),
+          catch: (cause) => new SqlError({ reason: classifyError(cause, "PgClient: Failed to connect", "connect") })
+        }),
+        () =>
+          Effect.promise(() => client.end()).pipe(
+            Effect.timeoutOption(1000)
+          ),
+        { interruptible: true }
+      ).pipe(
+        Effect.timeoutOrElse({
+          duration: options.connectTimeout ?? Duration.seconds(5),
+          orElse: () =>
+            Effect.fail(
+              new SqlError({
+                reason: new ConnectionError({
+                  cause: new Error("Connection timed out"),
+                  message: "PgClient: Connection timed out",
+                  operation: "connect"
+                })
+              })
+            )
+        })
+      )
+
+      return client
+    }),
+    acquireForStream: options.acquireForStream ?? false
+  })
+
+/**
+ * Builds a PostgreSQL client from a scoped `pg` pool acquisition effect, deriving transaction, streaming, and LISTEN/NOTIFY support from that pool.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
 export const fromPool = Effect.fnUntraced(function*(
   options: {
@@ -175,197 +306,149 @@ export const fromPool = Effect.fnUntraced(function*(
     readonly types?: Pg.CustomTypesConfig | undefined
   }
 ): Effect.fn.Return<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
-  const compiler = makeCompiler(
-    options.transformQueryNames,
-    options.transformJson
-  )
-  const transformRows = options.transformResultNames ?
-    Statement.defaultTransforms(
-      options.transformResultNames,
-      options.transformJson
-    ).array :
-    undefined
-
   const pool = yield* options.acquire
 
-  class ConnectionImpl implements Connection {
-    readonly pg: Pg.PoolClient | undefined
-    constructor(pg?: Pg.PoolClient) {
-      this.pg = pg
-    }
-
-    private runWithClient<A>(f: (client: Pg.PoolClient, resume: (_: Effect.Effect<A, SqlError>) => void) => void) {
-      if (this.pg !== undefined) {
-        return Effect.callback<A, SqlError>((resume) => {
-          f(this.pg!, resume)
-          return makeCancel(pool, this.pg!)
-        })
-      }
-      return Effect.callback<A, SqlError>((resume) => {
-        let done = false
-        let cancel: Effect.Effect<void> | undefined = undefined
-        let client: Pg.PoolClient | undefined = undefined
-        function onError(cause: Error) {
-          cleanup(cause)
-          resume(Effect.fail(new SqlError({ cause, message: "Connection error" })))
-        }
-        function cleanup(cause?: Error) {
-          if (!done) client?.release(cause)
-          done = true
-          client?.off("error", onError)
-        }
-        pool.connect((cause, client_) => {
-          if (cause) {
-            return resume(Effect.fail(new SqlError({ cause, message: "Failed to acquire connection" })))
-          } else if (!client_) {
-            return resume(
-              Effect.fail(
-                new SqlError({ message: "Failed to acquire connection", cause: new Error("No client returned") })
-              )
-            )
-          } else if (done) {
-            client_.release()
-            return
-          }
-          client = client_
-          client.once("error", onError)
-          cancel = makeCancel(pool, client)
-          f(client, (eff) => {
-            cleanup()
-            resume(eff)
+  const makeConection = (client?: Pg.PoolClient) =>
+    new ConnectionImpl(
+      function runWithClient<A>(f: (client: Pg.ClientBase, resume: (_: Effect.Effect<A, SqlError>) => void) => void) {
+        if (client !== undefined) {
+          return Effect.callback<A, SqlError>((resume) => {
+            f(client!, resume)
+            return makeCancel(pool, client!)
           })
-        })
-        return Effect.suspend(() => {
-          if (!cancel) {
-            cleanup()
-            return Effect.void
-          }
-          return Effect.ensuring(cancel, Effect.sync(cleanup))
-        })
-      })
-    }
-
-    private run(query: string, params: ReadonlyArray<unknown>) {
-      return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
-        client.query(query, params as any, (err, result) => {
-          if (err) {
-            resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
-          } else {
-            // Multi-statement queries return an array of results
-            resume(Effect.succeed(
-              Array.isArray(result)
-                ? result.map((r) => r.rows ?? [])
-                : result.rows ?? []
-            ))
+        }
+        return Effect.callback<A, SqlError>((resume) => {
+          let done = false
+          let cancel: Effect.Effect<void> | undefined = undefined
+          let client: Pg.PoolClient | undefined = undefined
+          function onError(cause: Error) {
+            cleanup(cause)
+            resume(Effect.fail(new SqlError({ reason: classifyError(cause, "Connection error", "acquireConnection") })))
           }
-        })
-      })
-    }
-
-    execute(
-      sql: string,
-      params: ReadonlyArray<unknown>,
-      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-    ) {
-      return transformRows
-        ? Effect.map(this.run(sql, params), transformRows)
-        : this.run(sql, params)
-    }
-    executeRaw(sql: string, params: ReadonlyArray<unknown>) {
-      return this.runWithClient<Pg.Result>((client, resume) => {
-        client.query(sql, params as any, (err, result) => {
-          if (err) {
-            resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
-          } else {
-            resume(Effect.succeed(result))
+          function cleanup(cause?: Error) {
+            if (!done) client?.release(cause)
+            done = true
+            client?.off("error", onError)
           }
-        })
-      })
-    }
-    executeWithoutTransform(sql: string, params: ReadonlyArray<unknown>) {
-      return this.run(sql, params)
-    }
-    executeValues(sql: string, params: ReadonlyArray<unknown>) {
-      return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
-        client.query(
-          {
-            text: sql,
-            rowMode: "array",
-            values: params as Array<string>
-          },
-          (err, result) => {
-            if (err) {
-              resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
-            } else {
-              resume(Effect.succeed(result.rows))
+          pool.connect((cause, client_) => {
+            if (cause) {
+              return resume(
+                Effect.fail(
+                  new SqlError({
+                    reason: classifyError(cause, "Failed to acquire connection", "acquireConnection")
+                  })
+                )
+              )
+            } else if (!client_) {
+              return resume(
+                Effect.fail(
+                  new SqlError({
+                    reason: new ConnectionError({
+                      message: "Failed to acquire connection",
+                      cause: new Error("No client returned"),
+                      operation: "acquireConnection"
+                    })
+                  })
+                )
+              )
+            } else if (done) {
+              client_.release()
+              return
             }
-          }
-        )
-      })
-    }
-    executeUnprepared(
-      sql: string,
-      params: ReadonlyArray<unknown>,
-      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-    ) {
-      return this.execute(sql, params, transformRows)
-    }
-    executeStream(
-      sql: string,
-      params: ReadonlyArray<unknown>,
-      transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
-    ) {
-      // oxlint-disable-next-line @typescript-eslint/no-this-alias
-      const self = this
-      return Stream.fromChannel(Channel.fromTransform(Effect.fnUntraced(function*(_, scope) {
-        const client = self.pg ?? (yield* Scope.provide(reserveRaw, scope))
-        yield* Scope.addFinalizer(scope, Effect.promise(() => cursor.close()))
-        const cursor = client.query(new Cursor(sql, params as any))
-        // @effect-diagnostics-next-line returnEffectInGen:off
-        return Effect.callback<Arr.NonEmptyReadonlyArray<any>, SqlError | Cause.Done>((resume) => {
-          cursor.read(128, (err, rows) => {
-            if (err) {
-              resume(Effect.fail(new SqlError({ cause: err, message: "Failed to execute statement" })))
-            } else if (Arr.isArrayNonEmpty(rows)) {
-              resume(Effect.succeed(transformRows ? transformRows(rows) as any : rows))
-            } else {
-              resume(Cause.done())
+            client = client_
+            client.once("error", onError)
+            cancel = makeCancel(pool, client)
+            f(client, (eff) => {
+              cleanup()
+              resume(eff)
+            })
+          })
+          return Effect.suspend(() => {
+            if (!cancel) {
+              cleanup()
+              return Effect.void
             }
+            return Effect.ensuring(cancel, Effect.sync(cleanup))
           })
         })
-      })))
-    }
-  }
+      },
+      client ? Effect.succeed(client) : reserveRaw
+    )
 
   const reserveRaw = Effect.callback<Pg.PoolClient, SqlError, Scope.Scope>((resume) => {
     const fiber = Fiber.getCurrent()!
-    const scope = ServiceMap.getUnsafe(fiber.services, Scope.Scope)
+    const scope = Context.getUnsafe(fiber.context, 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 resume(
+          Effect.fail(
+            new SqlError({
+              reason: classifyError(
+                err,
+                "Failed to acquire connection for transaction",
+                "acquireConnection"
+              )
             })
-          ),
-          client!
-        ))
-      }
-      function onError(cause_: Error) {
-        cause = cause_
+          )
+        )
+      } else if (!client) {
+        return resume(
+          Effect.fail(
+            new SqlError({
+              reason: new ConnectionError({
+                message: "Failed to acquire connection for transaction",
+                cause: new Error("No client returned"),
+                operation: "acquireConnection"
+              })
+            })
+          )
+        )
       }
-      client!.on("error", onError)
+      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))
+  const reserve = Effect.map(reserveRaw, makeConection)
 
-  const listenClient = yield* RcRef.make({
-    acquire: reserveRaw
+  const onListenClientError = (_: Error) => {
+  }
+
+  const listenAcquirer = yield* RcRef.make({
+    acquire: Effect.acquireRelease(
+      Effect.tryPromise({
+        try: async () => {
+          const client = new Pg.Client(pool.options)
+          await client.connect()
+          client.on("error", onListenClientError)
+          return client
+        },
+        catch: (cause) =>
+          new SqlError({
+            reason: classifyError(cause, "Failed to acquire connection for listen", "acquireConnection")
+          })
+      }),
+      (client) =>
+        Effect.promise(() => {
+          client.off("error", onListenClientError)
+          return client.end()
+        }).pipe(
+          Effect.timeoutOption(1000)
+        ),
+      { interruptible: true }
+    )
   })
 
   let config: PgClientConfig = {
@@ -386,7 +469,7 @@ export const fromPool = Effect.fnUntraced(function*(
       config = {
         ...config,
         host: config.host ?? parsed.host ?? undefined,
-        port: config.port ?? (parsed.port ? Number.parse(parsed.port) : undefined),
+        port: config.port ?? (parsed.port ? Option.getOrUndefined(Number.parse(parsed.port)) : undefined),
         username: config.username ?? parsed.user ?? undefined,
         password: config.password ?? (parsed.password ? Redacted.make(parsed.password) : undefined),
         database: config.database ?? parsed.database ?? undefined
@@ -396,10 +479,131 @@ export const fromPool = Effect.fnUntraced(function*(
     }
   }
 
+  return yield* makeWith({
+    acquirer: Effect.succeed(makeConection()),
+    transactionAcquirer: reserve,
+    listenAcquirer: RcRef.get(listenAcquirer),
+    config,
+    spanAttributes: options.spanAttributes,
+    transformResultNames: options.transformResultNames,
+    transformQueryNames: options.transformQueryNames,
+    transformJson: options.transformJson
+  })
+})
+
+/**
+ * Builds a PostgreSQL client from a scoped `pg` client acquisition effect, serializing access when sharing the client and optionally using separate clients for streams and LISTEN.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const fromClient = Effect.fnUntraced(function*(
+  options: {
+    readonly acquire: Effect.Effect<Pg.Client, SqlError, Scope.Scope>
+
+    /**
+     * Whether to acquire a separate client for each sql.stream / sql.listen.
+     */
+    readonly acquireForStream: boolean
+
+    readonly applicationName?: string | undefined
+    readonly spanAttributes?: Record<string, unknown> | undefined
+
+    readonly transformResultNames?: ((str: string) => string) | undefined
+    readonly transformQueryNames?: ((str: string) => string) | undefined
+    readonly transformJson?: boolean | undefined
+    readonly types?: Pg.CustomTypesConfig | undefined
+  }
+): Effect.fn.Return<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
+  function onError() {}
+  const acquireWithErrorHandler = options.acquire.pipe(
+    Effect.tap((client) => {
+      client.on("error", onError)
+      return Effect.addFinalizer(() => {
+        client.off("error", onError)
+        return Effect.void
+      })
+    })
+  )
+  const client = yield* acquireWithErrorHandler
+
+  const semaphore = Semaphore.makeUnsafe(1)
+  let streamClient = options.acquireForStream ? acquireWithErrorHandler : Effect.acquireRelease(
+    Effect.as(semaphore.take(1), client),
+    () => semaphore.release(1)
+  )
+
+  const makeConection = (client: Pg.Client) =>
+    new ConnectionImpl(
+      function runWithClient<A>(f: (client: Pg.ClientBase, resume: (_: Effect.Effect<A, SqlError>) => void) => void) {
+        return Effect.callback<A, SqlError>((resume) => {
+          f(client, resume)
+        })
+      },
+      streamClient
+    )
+  const connection = makeConection(client)
+  const acquirer = semaphore.withPermit(Effect.succeed(connection))
+
+  const config: PgClientConfig = {
+    ...options,
+    host: client.host,
+    port: client.port,
+    database: client.database,
+    username: client.user,
+    password: typeof client.password === "string" ? Redacted.make(client.password) : undefined,
+    ssl: client.ssl
+  }
+
+  return yield* makeWith({
+    acquirer,
+    transactionAcquirer: acquirer,
+    listenAcquirer: streamClient,
+    config,
+    spanAttributes: options.spanAttributes,
+    transformResultNames: options.transformResultNames,
+    transformQueryNames: options.transformQueryNames,
+    transformJson: options.transformJson
+  })
+})
+
+/**
+ * Low-level constructor for a `PgClient` from SQL connection acquirers, a LISTEN acquirer, client configuration, and transformation options.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const makeWith = Effect.fnUntraced(function*(
+  options: {
+    readonly acquirer: SqlConnection.Acquirer
+    readonly transactionAcquirer: SqlConnection.Acquirer
+    readonly listenAcquirer: Effect.Effect<Pg.ClientBase, SqlError, Scope.Scope>
+
+    readonly config: PgClientConfig
+    readonly spanAttributes?: Record<string, unknown> | undefined
+
+    readonly transformResultNames?: ((str: string) => string) | undefined
+    readonly transformQueryNames?: ((str: string) => string) | undefined
+    readonly transformJson?: boolean | undefined
+  }
+): Effect.fn.Return<PgClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
+  const compiler = makeCompiler(
+    options.transformQueryNames,
+    options.transformJson
+  )
+  const transformRows = options.transformResultNames ?
+    Statement.defaultTransforms(
+      options.transformResultNames,
+      options.transformJson
+    ).array :
+    undefined
+
+  const config = options.config
+
   return Object.assign(
     yield* Client.make({
-      acquirer: Effect.succeed(new ConnectionImpl()),
-      transactionAcquirer: reserve,
+      acquirer: options.acquirer,
+      transactionAcquirer: options.transactionAcquirer,
       compiler,
       spanAttributes: [
         ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
@@ -412,11 +616,11 @@ export const fromPool = Effect.fnUntraced(function*(
     }),
     {
       [TypeId]: TypeId as TypeId,
-      config,
+      config: options.config,
       json: (_: unknown) => Statement.fragment([PgJson(_)]),
       listen: (channel: string) =>
         Stream.callback<string, SqlError>(Effect.fnUntraced(function*(queue) {
-          const client = yield* RcRef.get(listenClient)
+          const client = yield* options.listenAcquirer
           function onNotification(msg: Pg.Notification) {
             if (msg.channel === channel && msg.payload) {
               Queue.offerUnsafe(queue, msg.payload)
@@ -430,24 +634,133 @@ export const fromPool = Effect.fnUntraced(function*(
           )
           yield* Effect.tryPromise({
             try: () => client.query(`LISTEN ${Pg.escapeIdentifier(channel)}`),
-            catch: (cause) => new SqlError({ cause, message: "Failed to listen" })
+            catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to listen", "listen") })
           })
           client.on("notification", onNotification)
         })),
       notify: (channel: string, payload: string) =>
-        Effect.callback<void, SqlError>((resume) => {
-          pool.query(`NOTIFY ${Pg.escapeIdentifier(channel)}, $1`, [payload], (err) => {
-            if (err) {
-              resume(Effect.fail(new SqlError({ cause: err, message: "Failed to notify" })))
-            } else {
-              resume(Effect.void)
-            }
-          })
-        })
+        Effect.asVoid(Effect.scoped(Effect.flatMap(
+          options.acquirer,
+          (conn) => conn.executeRaw(`SELECT pg_notify($1, $2)`, [channel, payload])
+        )))
     }
   )
 })
 
+class ConnectionImpl implements Connection {
+  constructor(
+    runWithClient: <A>(
+      f: (client: Pg.ClientBase, resume: (_: Effect.Effect<A, SqlError>) => void) => void
+    ) => Effect.Effect<A, SqlError>,
+    reserve: Effect.Effect<Pg.ClientBase, SqlError, Scope.Scope>
+  ) {
+    this.runWithClient = runWithClient
+    this.reserve = reserve
+  }
+
+  private readonly runWithClient: <A>(
+    f: (client: Pg.ClientBase, resume: (_: Effect.Effect<A, SqlError>) => void) => void
+  ) => Effect.Effect<A, SqlError>
+  private readonly reserve: Effect.Effect<Pg.ClientBase, SqlError, Scope.Scope>
+
+  private run(query: string, params: ReadonlyArray<unknown>) {
+    return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
+      client.query(query, params as any, (err, result) => {
+        if (err) {
+          resume(
+            Effect.fail(new SqlError({ reason: classifyError(err, "Failed to execute statement", "execute") }))
+          )
+        } else {
+          // Multi-statement queries return an array of results
+          resume(Effect.succeed(
+            Array.isArray(result)
+              ? result.map((r) => r.rows ?? [])
+              : result.rows ?? []
+          ))
+        }
+      })
+    })
+  }
+
+  execute(
+    sql: string,
+    params: ReadonlyArray<unknown>,
+    transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+  ) {
+    return transformRows
+      ? Effect.map(this.run(sql, params), transformRows)
+      : this.run(sql, params)
+  }
+  executeRaw(sql: string, params: ReadonlyArray<unknown>) {
+    return this.runWithClient<Pg.Result>((client, resume) => {
+      client.query(sql, params as any, (err, result) => {
+        if (err) {
+          resume(
+            Effect.fail(new SqlError({ reason: classifyError(err, "Failed to execute statement", "execute") }))
+          )
+        } else {
+          resume(Effect.succeed(result))
+        }
+      })
+    })
+  }
+  executeWithoutTransform(sql: string, params: ReadonlyArray<unknown>) {
+    return this.run(sql, params)
+  }
+  executeValues(sql: string, params: ReadonlyArray<unknown>) {
+    return this.runWithClient<ReadonlyArray<any>>((client, resume) => {
+      client.query(
+        {
+          text: sql,
+          rowMode: "array",
+          values: params as Array<string>
+        },
+        (err, result) => {
+          if (err) {
+            resume(
+              Effect.fail(new SqlError({ reason: classifyError(err, "Failed to execute statement", "execute") }))
+            )
+          } else {
+            resume(Effect.succeed(result.rows))
+          }
+        }
+      )
+    })
+  }
+  executeUnprepared(
+    sql: string,
+    params: ReadonlyArray<unknown>,
+    transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+  ) {
+    return this.execute(sql, params, transformRows)
+  }
+  executeStream(
+    sql: string,
+    params: ReadonlyArray<unknown>,
+    transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
+  ) {
+    // oxlint-disable-next-line @typescript-eslint/no-this-alias
+    const self = this
+    return Stream.fromChannel(Channel.fromTransform(Effect.fnUntraced(function*(_, scope) {
+      const client = yield* Scope.provide(self.reserve, scope)
+      yield* Scope.addFinalizer(scope, Effect.promise(() => cursor.close()))
+      const cursor = client.query(new Cursor(sql, params as any))
+      // @effect-diagnostics-next-line returnEffectInGen:off
+      return Effect.callback<Arr.NonEmptyReadonlyArray<any>, SqlError | Cause.Done>((resume) => {
+        cursor.read(128, (err, rows) => {
+          if (err) {
+            resume(Effect.fail(new SqlError({ reason: classifyError(err, "Failed to execute statement", "stream") })))
+          } else if (Arr.isArrayNonEmpty(rows)) {
+            resume(Effect.succeed(transformRows ? transformRows(rows) as any : rows))
+          } else {
+            resume(Cause.done())
+          }
+        })
+      })
+    })))
+  }
+}
+
 const cancelEffects = new WeakMap<Pg.PoolClient, Effect.Effect<void> | undefined>()
 const makeCancel = (pool: Pg.Pool, client: Pg.PoolClient) => {
   if (cancelEffects.has(client)) {
@@ -471,64 +784,52 @@ const makeCancel = (pool: Pg.Pool, client: Pg.PoolClient) => {
 }
 
 /**
+ * Creates a layer from an effect that acquires a `PgClient`, providing both `PgClient` and `SqlClient`.
+ *
  * @category layers
- * @since 1.0.0
+ * @since 4.0.0
  */
-export const layerConfig: (
-  config: Config.Wrap<PgClientConfig>
-) => Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> = (
-  config: Config.Wrap<PgClientConfig>
-): Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> =>
-  Layer.effectServices(
-    Config.unwrap(config).asEffect().pipe(
-      Effect.flatMap(make),
-      Effect.map((client) =>
-        ServiceMap.make(PgClient, client).pipe(
-          ServiceMap.add(Client.SqlClient, client)
-        )
-      )
-    )
-  ).pipe(Layer.provide(Reactivity.layer))
+export const layerFrom = <E, R>(
+  acquire: Effect.Effect<PgClient, E, R>
+): Layer.Layer<PgClient | Client.SqlClient, E, Exclude<R, Scope.Scope | Reactivity.Reactivity>> =>
+  Layer.effectContext(
+    Effect.map(acquire, (client) =>
+      Context.make(PgClient, client).pipe(
+        Context.add(Client.SqlClient, client)
+      ))
+  ).pipe(Layer.provide(Reactivity.layer)) as any
 
 /**
+ * Creates a layer from a `Config`-wrapped PostgreSQL pool configuration, providing both `PgClient` and `SqlClient`.
+ *
  * @category layers
- * @since 1.0.0
+ * @since 4.0.0
  */
-export const layer = (
-  config: PgClientConfig
-): Layer.Layer<PgClient | Client.SqlClient, SqlError> =>
-  Layer.effectServices(
-    Effect.map(make(config), (client) =>
-      ServiceMap.make(PgClient, client).pipe(
-        ServiceMap.add(Client.SqlClient, client)
-      ))
-  ).pipe(Layer.provide(Reactivity.layer))
+export const layerConfig: (
+  config: Config.Wrap<PgPoolConfig>
+) => Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> = (
+  config: Config.Wrap<PgPoolConfig>
+): Layer.Layer<PgClient | Client.SqlClient, Config.ConfigError | SqlError> =>
+  layerFrom(Effect.flatMap(
+    Config.unwrap(config),
+    make
+  ))
 
 /**
+ * Creates a layer from a concrete PostgreSQL pool configuration, providing both `PgClient` and `SqlClient`.
+ *
  * @category layers
- * @since 1.0.0
+ * @since 4.0.0
  */
-export const layerFromPool = (options: {
-  readonly acquire: Effect.Effect<Pg.Pool, SqlError, Scope.Scope>
-
-  readonly applicationName?: string | undefined
-  readonly spanAttributes?: Record<string, unknown> | undefined
-
-  readonly transformResultNames?: ((str: string) => string) | undefined
-  readonly transformQueryNames?: ((str: string) => string) | undefined
-  readonly transformJson?: boolean | undefined
-  readonly types?: Pg.CustomTypesConfig | undefined
-}): Layer.Layer<PgClient | Client.SqlClient, SqlError> =>
-  Layer.effectServices(
-    Effect.map(fromPool(options), (client) =>
-      ServiceMap.make(PgClient, client).pipe(
-        ServiceMap.add(Client.SqlClient, client)
-      ))
-  ).pipe(Layer.provide(Reactivity.layer))
+export const layer = (
+  config: PgPoolConfig
+): Layer.Layer<PgClient | Client.SqlClient, SqlError> => layerFrom(make(config))
 
 /**
- * @category constructor
- * @since 1.0.0
+ * Creates the PostgreSQL statement compiler, using `$1` placeholders, double-quoted identifiers, PostgreSQL returning clauses, and optional JSON value transformation.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
 export const makeCompiler = (
   transform?: (_: string) => string,
@@ -576,18 +877,87 @@ export const makeCompiler = (
 const escape = Statement.defaultEscape("\"")
 
 /**
+ * PostgreSQL-specific custom statement fragments supported by the compiler, currently JSON parameter fragments.
+ *
  * @category custom types
- * @since 1.0.0
+ * @since 4.0.0
  */
 export type PgCustom = PgJson
 
 /**
  * @category custom types
- * @since 1.0.0
+ * @since 4.0.0
  */
 interface PgJson extends Custom<"PgJson", unknown> {}
 /**
  * @category custom types
- * @since 1.0.0
+ * @since 4.0.0
  */
 const PgJson = Statement.custom<PgJson>("PgJson")
+
+const ATTR_DB_SYSTEM_NAME = "db.system.name"
+const ATTR_DB_NAMESPACE = "db.namespace"
+const ATTR_SERVER_ADDRESS = "server.address"
+const ATTR_SERVER_PORT = "server.port"
+
+const pgCodeFromCause = (cause: unknown): string | undefined => {
+  if (typeof cause !== "object" || cause === null || !("code" in cause)) {
+    return undefined
+  }
+  const code = cause.code
+  return typeof code === "string" ? code : undefined
+}
+
+const pgConstraintFromCause = (cause: unknown): string => {
+  if (typeof cause !== "object" || cause === null || !("constraint" in cause)) {
+    return "unknown"
+  }
+  const constraint = cause.constraint
+  if (typeof constraint !== "string") {
+    return "unknown"
+  }
+  const normalized = constraint.trim()
+  return normalized.length === 0 ? "unknown" : normalized
+}
+
+const classifyError = (
+  cause: unknown,
+  message: string,
+  operation: string
+) => {
+  const props = { cause, message, operation }
+  const code = pgCodeFromCause(cause)
+  if (code !== undefined) {
+    if (code.startsWith("08")) {
+      return new ConnectionError(props)
+    }
+    if (code.startsWith("28")) {
+      return new AuthenticationError(props)
+    }
+    if (code === "42501") {
+      return new AuthorizationError(props)
+    }
+    if (code.startsWith("42")) {
+      return new SqlSyntaxError(props)
+    }
+    if (code === "23505") {
+      return new UniqueViolation({ ...props, constraint: pgConstraintFromCause(cause) })
+    }
+    if (code.startsWith("23")) {
+      return new ConstraintError(props)
+    }
+    if (code === "40P01") {
+      return new DeadlockError(props)
+    }
+    if (code === "40001") {
+      return new SerializationError(props)
+    }
+    if (code === "55P03") {
+      return new LockTimeoutError(props)
+    }
+    if (code === "57014") {
+      return new StatementTimeoutError(props)
+    }
+  }
+  return new UnknownError(props)
+}