@reventlessdev/reventless-postgres 3.0.0-alpha.124 → 3.0.0-alpha.125

package/lib/ocaml/DcbEventLogStorage_Postgres_Ops.res

@@ -143,7 +143,7 @@ let buildReadWhere = (
 // Strip the zero-padding a cursor carries for string-sortability, leaving a
 // plain decimal both `::xid8` and `::bigint` parse unambiguously ("0" if empty).
 let stripZeros = (s: string): string => {
-  let t = s->String.replaceRegExp(%re("/^0+/"), "")
+  let t = s->String.replaceRegExp(/^0+/, "")
   t == "" ? "0" : t
 }
 
@@ -222,49 +222,45 @@ let makeOps = (
     }
   }
 
-  let append = async (
-    newEvents: array<DcbEventLog_Adapter.rawStoredEvent>,
-    ~condition=?,
-  ): result<DcbTag.sequencePosition, ReventlessInfra.DcbEventLog.appendError> => {
+  let append = async (newEvents: array<DcbEventLog_Adapter.rawStoredEvent>, ~condition=?): result<
+    DcbTag.sequencePosition,
+    ReventlessInfra.DcbEventLog.appendError,
+  > => {
     let eventsJson = JSON.Array(
-      newEvents->Array.map(ev =>
-        JSON.Object(
+      newEvents->Array.map(ev => JSON.Object(
+        Dict.fromArray([
+          ("event_type", JSON.Encode.string(ev.eventType)),
+          (
+            "tags",
+            JSON.Array(ev.tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value))),
+          ),
+          ("data", ev.data),
+          ("meta", ev.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
+        ]),
+      )),
+    )
+    let conditionParam = switch condition {
+    | Some(cond: DcbTag.appendCondition) =>
+      let queryJson = JSON.Array(
+        cond.query->Array.map(clause => JSON.Object(
           Dict.fromArray([
-            ("event_type", JSON.Encode.string(ev.eventType)),
+            (
+              "eventTypes",
+              switch clause.eventTypes {
+              | Some(types) => JSON.Array(types->Array.map(JSON.Encode.string))
+              | None => JSON.Encode.null
+              },
+            ),
             (
               "tags",
-              JSON.Array(ev.tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value))),
+              switch clause.tags {
+              | Some(tags) =>
+                JSON.Array(tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value)))
+              | None => JSON.Encode.null
+              },
             ),
-            ("data", ev.data),
-            ("meta", ev.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
           ]),
-        )
-      ),
-    )
-    let conditionParam = switch condition {
-    | Some(cond: DcbTag.appendCondition) =>
-      let queryJson = JSON.Array(
-        cond.query->Array.map(clause =>
-          JSON.Object(
-            Dict.fromArray([
-              (
-                "eventTypes",
-                switch clause.eventTypes {
-                | Some(types) => JSON.Array(types->Array.map(JSON.Encode.string))
-                | None => JSON.Encode.null
-                },
-              ),
-              (
-                "tags",
-                switch clause.tags {
-                | Some(tags) =>
-                  JSON.Array(tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value)))
-                | None => JSON.Encode.null
-                },
-              ),
-            ]),
-          )
-        ),
+        )),
       )
       let fields = [("query", queryJson)]
       switch cond.after {
@@ -306,7 +302,10 @@ let makeOps = (
         ? Error(ReventlessInfra.DcbEventLog.Conflict)
         : Error(
             ReventlessInfra.DcbEventLog.StorageFailure(
-              exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("storage error"),
+              exn
+              ->JsExn.fromException
+              ->Option.flatMap(JsExn.message)
+              ->Option.getOr("storage error"),
             ),
           )
     }
@@ -324,7 +323,9 @@ let makeOps = (
       Effect.promise(() => {
         let b = mkBuilder()
         let where = buildReadWhere(b, ~name, ~query, ~after=cursor, ~applyFence=true)
-        let sql = `SELECT ${selectColumns}, transaction_id::text AS tx_raw, position::text AS pos_raw FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(pageSize)}`
+        let sql = `SELECT ${selectColumns}, transaction_id::text AS tx_raw, position::text AS pos_raw FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
+            pageSize,
+          )}`
         pool->PgDriver.query(sql, b.params)
       })->Effect.map(rows => {
         let events = rows->Array.map(rowToEvent)

package/lib/ocaml/EventLogChangeFeed.res

@@ -90,11 +90,12 @@ let readBatch = async (
     params->Array.push(JSON.Encode.string(tx))
     params->Array.push(JSON.Encode.string(pos))
     where :=
-      where.contents ++
-      " AND (transaction_id > $2::xid8 OR (transaction_id = $2::xid8 AND global_seq > $3::bigint))"
+      where.contents ++ " AND (transaction_id > $2::xid8 OR (transaction_id = $2::xid8 AND global_seq > $3::bigint))"
   | None => ()
   }
-  let sql = `SELECT ${selectColumns} FROM event_log WHERE ${where.contents} ORDER BY transaction_id ASC, global_seq ASC LIMIT ${Int.toString(limit)}`
+  let sql = `SELECT ${selectColumns} FROM event_log WHERE ${where.contents} ORDER BY transaction_id ASC, global_seq ASC LIMIT ${Int.toString(
+      limit,
+    )}`
   let rows = await pool->PgDriver.query(sql, params)
   let events = rows->Array.map(rowToEvent)
   let cursor = switch events->Array.get(events->Array.length - 1) {
@@ -166,7 +167,12 @@ let drain = async (
   let cursor = ref(await loadCheckpoint(pool, ~subscriber))
   let continue = ref(true)
   while continue.contents {
-    let {events, cursor: newCursor} = await readBatch(pool, ~logName, ~after=?cursor.contents, ~limit)
+    let {events, cursor: newCursor} = await readBatch(
+      pool,
+      ~logName,
+      ~after=?cursor.contents,
+      ~limit,
+    )
     if events->Array.length == 0 {
       continue := false
     } else {

package/lib/ocaml/EventLogStorage_Postgres_Ops.res

@@ -44,12 +44,10 @@ let isUniqueViolation = (exn: exn): bool => {
 
 // Builds the classic runtime op set bound to `pool`. Returns `(name, ops)`; the
 // deploy-time `EventLog_Adapter` wrapper lives in `EventLogStorage_Postgres`.
-let makeOps = (
-  ~pool: PgDriver.pool,
-  ~name: string,
-  ~opts as _,
-  ~onAppended=noTracking,
-): (string, EventLog_Adapter.operations) => {
+let makeOps = (~pool: PgDriver.pool, ~name: string, ~opts as _, ~onAppended=noTracking): (
+  string,
+  EventLog_Adapter.operations,
+) => {
   let appendTracked = async (~track, seqNr: int, id: string, jsons: array<JSON.t>) => {
     // Empty append is a legitimate no-op (at-least-once retries, idempotent
     // commands), NOT a conflict — return before the guarded insert whose 0-row
@@ -95,7 +93,10 @@ let makeOps = (
           ? Error(EventLog.Conflict)
           : Error(
               EventLog.StorageFailure(
-                exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("storage error"),
+                exn
+                ->JsExn.fromException
+                ->Option.flatMap(JsExn.message)
+                ->Option.getOr("storage error"),
               ),
             )
       }
@@ -106,12 +107,14 @@ let makeOps = (
     appendTracked(~track=true, seqNr, id, jsons)
 
   let replayArray = async (id: string, ~fromSeq=0): array<JSON.t> =>
-    (await pool->PgDriver.query(
-      "SELECT payload FROM event_log
+    (
+      await pool->PgDriver.query(
+        "SELECT payload FROM event_log
         WHERE log_name = $1 AND aggregate_id = $2 AND seq_nr >= $3::bigint
         ORDER BY seq_nr ASC",
-      [JSON.Encode.string(name), JSON.Encode.string(id), JSON.Encode.int(fromSeq)],
-    ))->Array.map(decodePayload)
+        [JSON.Encode.string(name), JSON.Encode.string(id), JSON.Encode.int(fromSeq)],
+      )
+    )->Array.map(decodePayload)
 
   let replay: EventLog.replay<string, JSON.t> = id => replayArray(id)
 
@@ -152,14 +155,21 @@ let makeOps = (
       Ok()
     } catch {
     | exn =>
-      Error(exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("snapshot write error"))
+      Error(
+        exn
+        ->JsExn.fromException
+        ->Option.flatMap(JsExn.message)
+        ->Option.getOr("snapshot write error"),
+      )
     }
 
   let appendStream: EventLog.appendStream<string, JSON.t> = (startingSeqNr, id, stream) =>
     stream
     ->Stream.runCollect
     ->Effect.flatMap(jsons =>
-      Effect.promise(() => appendTracked(~track=false, startingSeqNr, id, jsons))->Effect.flatMap(result =>
+      Effect.promise(() =>
+        appendTracked(~track=false, startingSeqNr, id, jsons)
+      )->Effect.flatMap(result =>
         switch result {
         | Ok() => Effect.succeed()
         | Error(EventLog.Conflict) => Effect.fail("conflict")

package/lib/ocaml/PgChangeFeed.res

@@ -49,7 +49,9 @@ let readBatch = async (
     ~after=after->Option.flatMap(Dcb.decodeCursor),
     ~applyFence=true,
   )
-  let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(limit)}`
+  let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
+      limit,
+    )}`
   let rows = await pool->PgDriver.query(sql, b.params)
   let events = rows->Array.map(Dcb.rowToEvent)
   let cursor = switch events->Array.get(events->Array.length - 1) {
@@ -63,10 +65,9 @@ let readBatch = async (
 
 // The persisted checkpoint for `subscriber`, encoded as a cursor, or None if the
 // subscriber has never committed (→ replay from the beginning).
-let loadCheckpoint = async (
-  pool: PgDriver.pool,
-  ~subscriber: string,
-): option<DcbTag.sequencePosition> =>
+let loadCheckpoint = async (pool: PgDriver.pool, ~subscriber: string): option<
+  DcbTag.sequencePosition,
+> =>
   switch await pool->PgDriver.queryOne(
     "SELECT lpad(last_tx::text, 20, '0') || ':' || lpad(last_position::text, 20, '0') AS cursor
        FROM dcb_subscription WHERE subscriber = $1 AND last_position > 0",
@@ -105,8 +106,9 @@ let saveCheckpoint = async (
 // dedicated client (caller owns it — release via PgDriver.unlisten). Pair with a
 // low-frequency fallback tick in the consumer loop so a missed NOTIFY only adds
 // latency, never a permanent stall.
-let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<PgDriver.client> =>
-  pool->PgDriver.listen(~channel="dcb_" ++ logName, ~onNotify=_ => onWake())
+let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<
+  PgDriver.client,
+> => pool->PgDriver.listen(~channel="dcb_" ++ logName, ~onNotify=_ => onWake())
 
 let unlisten = (client: PgDriver.client, ~logName: string): promise<unit> =>
   client->PgDriver.unlisten(~channel="dcb_" ++ logName)
@@ -129,7 +131,12 @@ let drain = async (
   let cursor = ref(await loadCheckpoint(pool, ~subscriber))
   let continue = ref(true)
   while continue.contents {
-    let {events, cursor: newCursor} = await readBatch(pool, ~logName, ~after=?cursor.contents, ~limit)
+    let {events, cursor: newCursor} = await readBatch(
+      pool,
+      ~logName,
+      ~after=?cursor.contents,
+      ~limit,
+    )
     if events->Array.length == 0 {
       continue := false
     } else {

package/lib/ocaml/PgDriver.res

@@ -47,8 +47,7 @@ type queryResult = {rows: array<dict<JSON.t>>}
 
 let query = async (pool, sql, params) => (await _query(pool, sql, params)).rows
 
-let queryOne = async (pool, sql, params) =>
-  (await _query(pool, sql, params)).rows->Array.get(0)
+let queryOne = async (pool, sql, params) => (await _query(pool, sql, params)).rows->Array.get(0)
 
 let exec = async (pool, sql) => {
   let _ = await _queryText(pool, sql)

package/lib/ocaml/PostgresIntegrationTest.res

@@ -100,7 +100,11 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("append + read round-trips events with tags", async () => {
       let (_n, ops, _s) = makeLog("dcb-rt")
-      let e1 = stored("ItemAdded", [{key: "itemId", value: "x1"}], jsonObj([("n", JSON.Encode.string("w"))]))
+      let e1 = stored(
+        "ItemAdded",
+        [{key: "itemId", value: "x1"}],
+        jsonObj([("n", JSON.Encode.string("w"))]),
+      )
       let r = await ops.append([e1])
       switch r {
       | Ok(_) => expect(true)->toBe(true)
@@ -116,7 +120,12 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("conditional append conflicts when the boundary already has an event", async () => {
       let (_n, ops, _s) = makeLog("dcb-cond")
-      let mk = who => stored("Reserved", [{key: "seatId", value: "s1"}], jsonObj([("who", JSON.Encode.string(who))]))
+      let mk = who =>
+        stored(
+          "Reserved",
+          [{key: "seatId", value: "s1"}],
+          jsonObj([("who", JSON.Encode.string(who))]),
+        )
       let r1 = await ops.append([mk("a")])
       switch r1 {
       | Ok(_) => expect(true)->toBe(true)
@@ -134,37 +143,46 @@ switch processEnv->Dict.get("PG_URL") {
     })
 
     let writeSkew = (strategy, logName) =>
-      testPromise(`write-skew: exactly one of two concurrent appends wins (${logName})`, async () => {
-        let (_n, ops, _s) = DcbEventLogStorage_Postgres.makeStorage(
-          ~pool,
-          ~name=logName,
-          ~indexes=[],
-          ~partitionTag=DcbTag.Simple({key: "k"}),
-          ~opts,
-          ~lockStrategy=strategy,
-        )
-        let cond: DcbTag.appendCondition = {
-          query: [{eventTypes: ["Reserved"], tags: [{key: "seatId", value: "hot"}]}],
-        }
-        let mk = who => stored("Reserved", [{key: "seatId", value: "hot"}], jsonObj([("who", JSON.Encode.string(who))]))
-        // Dispatch BOTH before awaiting either — genuinely concurrent on the pool.
-        let p1 = ops.append([mk("a")], ~condition=cond)
-        let p2 = ops.append([mk("b")], ~condition=cond)
-        let r1 = await p1
-        let r2 = await p2
-        let isOk = r => switch r {
-        | Ok(_) => true
-        | _ => false
-        }
-        let isConflict = r => r == Error(ReventlessInfra.DcbEventLog.Conflict)
-        let oks = [r1, r2]->Array.filter(isOk)->Array.length
-        let conflicts = [r1, r2]->Array.filter(isConflict)->Array.length
-        expect(oks)->toBe(1)
-        expect(conflicts)->toBe(1)
-        // And only one event actually landed on the boundary.
-        let read = await ops.read(~query=[{tags: [{key: "seatId", value: "hot"}]}])
-        expect(read.events->Array.length)->toBe(1)
-      })
+      testPromise(
+        `write-skew: exactly one of two concurrent appends wins (${logName})`,
+        async () => {
+          let (_n, ops, _s) = DcbEventLogStorage_Postgres.makeStorage(
+            ~pool,
+            ~name=logName,
+            ~indexes=[],
+            ~partitionTag=DcbTag.Simple({key: "k"}),
+            ~opts,
+            ~lockStrategy=strategy,
+          )
+          let cond: DcbTag.appendCondition = {
+            query: [{eventTypes: ["Reserved"], tags: [{key: "seatId", value: "hot"}]}],
+          }
+          let mk = who =>
+            stored(
+              "Reserved",
+              [{key: "seatId", value: "hot"}],
+              jsonObj([("who", JSON.Encode.string(who))]),
+            )
+          // Dispatch BOTH before awaiting either — genuinely concurrent on the pool.
+          let p1 = ops.append([mk("a")], ~condition=cond)
+          let p2 = ops.append([mk("b")], ~condition=cond)
+          let r1 = await p1
+          let r2 = await p2
+          let isOk = r =>
+            switch r {
+            | Ok(_) => true
+            | _ => false
+            }
+          let isConflict = r => r == Error(ReventlessInfra.DcbEventLog.Conflict)
+          let oks = [r1, r2]->Array.filter(isOk)->Array.length
+          let conflicts = [r1, r2]->Array.filter(isConflict)->Array.length
+          expect(oks)->toBe(1)
+          expect(conflicts)->toBe(1)
+          // And only one event actually landed on the boundary.
+          let read = await ops.read(~query=[{tags: [{key: "seatId", value: "hot"}]}])
+          expect(read.events->Array.length)->toBe(1)
+        },
+      )
 
     writeSkew(#AdvisoryLocks, "dcb-skew-advisory")
     writeSkew(#RowLocks, "dcb-skew-rows")
@@ -176,17 +194,31 @@ switch processEnv->Dict.get("PG_URL") {
       }
       let n = 12
       // Dispatch all N before awaiting any — genuinely concurrent on the pool.
-      let promises = Array.make(~length=n, 0)->Array.mapWithIndex((_, i) =>
-        ops.append(
-          [stored("Claimed", [{key: "prizeId", value: "p1"}], jsonObj([("who", JSON.Encode.int(i))]))],
-          ~condition=cond,
+      let promises =
+        Array.make(~length=n, 0)->Array.mapWithIndex(
+          (_, i) =>
+            ops.append(
+              [
+                stored(
+                  "Claimed",
+                  [{key: "prizeId", value: "p1"}],
+                  jsonObj([("who", JSON.Encode.int(i))]),
+                ),
+              ],
+              ~condition=cond,
+            ),
         )
-      )
       let results = await Promise.all(promises)
-      let oks = results->Array.filter(r => switch r {
-      | Ok(_) => true
-      | _ => false
-      })->Array.length
+      let oks =
+        results
+        ->Array.filter(
+          r =>
+            switch r {
+            | Ok(_) => true
+            | _ => false
+            },
+        )
+        ->Array.length
       expect(oks)->toBe(1)
       // No lost updates: exactly one Claimed landed on the boundary.
       let read = await ops.read(~query=[{tags: [{key: "prizeId", value: "p1"}]}])
@@ -195,7 +227,8 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("cursors are monotonic and usable as `after`", async () => {
       let (_n, ops, _s) = makeLog("dcb-cursor")
-      let mk = i => stored("Tick", [{key: "streamId", value: "c1"}], jsonObj([("i", JSON.Encode.int(i))]))
+      let mk = i =>
+        stored("Tick", [{key: "streamId", value: "c1"}], jsonObj([("i", JSON.Encode.int(i))]))
       let _ = await ops.append([mk(0)])
       let mid = switch await ops.append([mk(1)]) {
       | Ok(pos) => pos
@@ -222,83 +255,103 @@ switch processEnv->Dict.get("PG_URL") {
       let _ = await ops.append([mk(0), mk(1), mk(2)])
 
       let collected = ref(0)
-      let processed = await PgChangeFeed.drain(pool, ~logName="feed-log", ~subscriber="sub-1", ~handle=async evs => {
-        collected := collected.contents + evs->Array.length
-      })
+      let processed = await PgChangeFeed.drain(
+        pool,
+        ~logName="feed-log",
+        ~subscriber="sub-1",
+        ~handle=async evs => {
+          collected := collected.contents + evs->Array.length
+        },
+      )
       expect(processed)->toBe(3)
       expect(collected.contents)->toBe(3)
 
       // A second drain from the saved checkpoint sees nothing new.
-      let again = await PgChangeFeed.drain(pool, ~logName="feed-log", ~subscriber="sub-1", ~handle=async _ => ())
+      let again = await PgChangeFeed.drain(
+        pool,
+        ~logName="feed-log",
+        ~subscriber="sub-1",
+        ~handle=async _ => (),
+      )
       expect(again)->toBe(0)
     })
   })
 
   describe("classic change feed (event_log, B2.5)", () => {
-    testPromise("drains classic events in commit order, with fields, then checkpoints", async () => {
-      let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-orders", ~opts)
-      let _ = await ops.append(0, "agg-1", [evJson("m0", 1), evJson("m1", 2)])
-      let _ = await ops.append(0, "agg-2", [evJson("m2", 3)])
+    testPromise(
+      "drains classic events in commit order, with fields, then checkpoints",
+      async () => {
+        let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-orders", ~opts)
+        let _ = await ops.append(0, "agg-1", [evJson("m0", 1), evJson("m1", 2)])
+        let _ = await ops.append(0, "agg-2", [evJson("m2", 3)])
 
-      let collected = ref([])
-      let processed = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-orders",
-        ~subscriber="cf-sub",
-        ~handle=async evs => collected := collected.contents->Array.concat(evs),
-      )
-      expect(processed)->toBe(3)
-      expect(collected.contents->Array.length)->toBe(3)
+        let collected = ref([])
+        let processed = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-orders",
+          ~subscriber="cf-sub",
+          ~handle=async evs => collected := collected.contents->Array.concat(evs),
+        )
+        expect(processed)->toBe(3)
+        expect(collected.contents->Array.length)->toBe(3)
 
-      // Fields round-trip from the stored row.
-      let first = collected.contents->Array.getUnsafe(0)
-      expect(first.aggregateId)->toBe("agg-1")
-      expect(first.seqNr)->toBe(0)
-      expect(first.msgId)->toEqual(Some("m0"))
+        // Fields round-trip from the stored row.
+        let first = collected.contents->Array.getUnsafe(0)
+        expect(first.aggregateId)->toBe("agg-1")
+        expect(first.seqNr)->toBe(0)
+        expect(first.msgId)->toEqual(Some("m0"))
 
-      // Cursors are strictly increasing in drain order.
-      let cursors = collected.contents->Array.map(e => e.cursor)
-      let increasing = ref(true)
-      for i in 1 to cursors->Array.length - 1 {
-        if cursors->Array.getUnsafe(i) <= cursors->Array.getUnsafe(i - 1) {
-          increasing := false
+        // Cursors are strictly increasing in drain order.
+        let cursors = collected.contents->Array.map(e => e.cursor)
+        let increasing = ref(true)
+        for i in 1 to cursors->Array.length - 1 {
+          if cursors->Array.getUnsafe(i) <= cursors->Array.getUnsafe(i - 1) {
+            increasing := false
+          }
         }
-      }
-      expect(increasing.contents)->toBe(true)
+        expect(increasing.contents)->toBe(true)
 
-      // Second drain from the saved checkpoint sees nothing new.
-      let again = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-orders",
-        ~subscriber="cf-sub",
-        ~handle=async _ => (),
-      )
-      expect(again)->toBe(0)
-    })
+        // Second drain from the saved checkpoint sees nothing new.
+        let again = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-orders",
+          ~subscriber="cf-sub",
+          ~handle=async _ => (),
+        )
+        expect(again)->toBe(0)
+      },
+    )
 
-    testPromise("concurrent appends across aggregates: every event drained exactly once", async () => {
-      let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-concurrent", ~opts)
-      let n = 20
-      // One event per aggregate, all dispatched before awaiting — genuinely
-      // concurrent on the pool, so global_seq is assigned in interleaved/undefined
-      // commit order. The xmin fence must still drain every event exactly once.
-      let promises =
-        Array.make(~length=n, 0)->Array.mapWithIndex((_, i) =>
-          ops.append(0, "agg-" ++ Int.toString(i), [evJson("m" ++ Int.toString(i), i)])
+    testPromise(
+      "concurrent appends across aggregates: every event drained exactly once",
+      async () => {
+        let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(
+          ~pool,
+          ~name="cf-concurrent",
+          ~opts,
         )
-      let _ = await Promise.all(promises)
+        let n = 20
+        // One event per aggregate, all dispatched before awaiting — genuinely
+        // concurrent on the pool, so global_seq is assigned in interleaved/undefined
+        // commit order. The xmin fence must still drain every event exactly once.
+        let promises =
+          Array.make(~length=n, 0)->Array.mapWithIndex(
+            (_, i) => ops.append(0, "agg-" ++ Int.toString(i), [evJson("m" ++ Int.toString(i), i)]),
+          )
+        let _ = await Promise.all(promises)
 
-      let collected = ref([])
-      let _ = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-concurrent",
-        ~subscriber="cf-conc-sub",
-        ~handle=async evs => collected := collected.contents->Array.concat(evs),
-      )
-      // No skips: all N events present. No dupes: N distinct cursors.
-      expect(collected.contents->Array.length)->toBe(n)
-      let distinctCursors = collected.contents->Array.map(e => e.cursor)->Set.fromArray
-      expect(distinctCursors->Set.size)->toBe(n)
-    })
+        let collected = ref([])
+        let _ = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-concurrent",
+          ~subscriber="cf-conc-sub",
+          ~handle=async evs => collected := collected.contents->Array.concat(evs),
+        )
+        // No skips: all N events present. No dupes: N distinct cursors.
+        expect(collected.contents->Array.length)->toBe(n)
+        let distinctCursors = collected.contents->Array.map(e => e.cursor)->Set.fromArray
+        expect(distinctCursors->Set.size)->toBe(n)
+      },
+    )
   })
 }