@reventlessdev/reventless-postgres 3.0.0-alpha.1 → 3.0.0-alpha.11

package/lib/bs/src/EventLogStorage_Postgres_Ops.res.mjs

@@ -0,0 +1,202 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Stream from "@reventlessdev/rescript-effect/src/Stream.res.mjs";
+import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
+import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Effect from "effect/Effect";
+import * as Stream$1 from "effect/Stream";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
+
+function noTracking(param) {
+  
+}
+
+function decodePayload(row) {
+  return Stdlib_Option.getOr(row["payload"], null);
+}
+
+function coerceInt(v) {
+  switch (typeof v) {
+    case "string" :
+      return Stdlib_Option.getOr(Stdlib_Int.fromString(v, undefined), 0);
+    case "number" :
+      return v | 0;
+    default:
+      return 0;
+  }
+}
+
+async function countAll(pool) {
+  let row = await PgDriver$ReventlessPostgres.queryOne(pool, "SELECT COUNT(*)::bigint AS c FROM event_log", []);
+  if (row !== undefined) {
+    return Stdlib_Option.getOr(Stdlib_Option.map(row["c"], coerceInt), 0);
+  } else {
+    return 0;
+  }
+}
+
+function isUniqueViolation(exn) {
+  let msg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "");
+  if (msg.includes("duplicate key") || msg.includes("unique")) {
+    return true;
+  } else {
+    return msg.includes("23505");
+  }
+}
+
+function makeOps(pool, name, param, onAppendedOpt) {
+  let onAppended = onAppendedOpt !== undefined ? onAppendedOpt : noTracking;
+  let appendTracked = async (track, seqNr, id, jsons) => {
+    if (jsons.length === 0) {
+      return {
+        TAG: "Ok",
+        _0: undefined
+      };
+    }
+    try {
+      let rows = await PgDriver$ReventlessPostgres.query(pool, "INSERT INTO event_log(log_name, aggregate_id, seq_nr, payload, msg_id)\n           SELECT $1, $2, $3::bigint + (ord - 1), value, value->>'msgId'\n             FROM jsonb_array_elements($4::jsonb) WITH ORDINALITY AS t(value, ord)\n            WHERE $3::bigint = (SELECT COALESCE(MAX(seq_nr), -1) + 1\n                                  FROM event_log\n                                 WHERE log_name = $1 AND aggregate_id = $2)\n           RETURNING global_seq, msg_id", [
+        name,
+        id,
+        seqNr,
+        JSON.stringify(jsons)
+      ]);
+      if (rows.length === 0) {
+        return {
+          TAG: "Error",
+          _0: "Conflict"
+        };
+      } else {
+        if (track) {
+          onAppended(Stdlib_Array.filterMap(rows, row => {
+            let match = row["msg_id"];
+            let match$1 = row["global_seq"];
+            if (typeof match === "string" && match$1 !== undefined) {
+              return [
+                match,
+                coerceInt(match$1)
+              ];
+            }
+          }));
+        }
+        return {
+          TAG: "Ok",
+          _0: undefined
+        };
+      }
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      if (isUniqueViolation(exn)) {
+        return {
+          TAG: "Error",
+          _0: "Conflict"
+        };
+      } else {
+        return {
+          TAG: "Error",
+          _0: {
+            TAG: "StorageFailure",
+            _0: Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "storage error")
+          }
+        };
+      }
+    }
+  };
+  let append = (seqNr, id, jsons) => appendTracked(true, seqNr, id, jsons);
+  let replayArray = async (id, fromSeqOpt) => {
+    let fromSeq = fromSeqOpt !== undefined ? fromSeqOpt : 0;
+    return (await PgDriver$ReventlessPostgres.query(pool, "SELECT payload FROM event_log\n        WHERE log_name = $1 AND aggregate_id = $2 AND seq_nr >= $3::bigint\n        ORDER BY seq_nr ASC", [
+      name,
+      id,
+      fromSeq
+    ])).map(decodePayload);
+  };
+  let replay = id => replayArray(id, undefined);
+  let replayStream = (id, fromSeq) => Stream$1.flatMap(Stream$1.fromEffect(Effect.promise(() => replayArray(id, fromSeq))), arr => Stream$1.fromIterable(arr));
+  let latestSnapshot = async id => {
+    let row = await PgDriver$ReventlessPostgres.queryOne(pool, "SELECT seq_nr, state, schema_hash FROM snapshot WHERE log_name = $1 AND aggregate_id = $2", [
+      name,
+      id
+    ]);
+    if (row === undefined) {
+      return {
+        TAG: "Ok",
+        _0: undefined
+      };
+    }
+    let match = row["seq_nr"];
+    let match$1 = row["state"];
+    let match$2 = row["schema_hash"];
+    if (match !== undefined && match$1 !== undefined && typeof match$2 === "string") {
+      return {
+        TAG: "Ok",
+        _0: {
+          seqNr: coerceInt(match),
+          state: match$1,
+          schemaHash: match$2
+        }
+      };
+    } else {
+      return {
+        TAG: "Error",
+        _0: "snapshot row has unexpected shape"
+      };
+    }
+  };
+  let writeSnapshot = async (id, snap) => {
+    try {
+      await PgDriver$ReventlessPostgres.query(pool, "INSERT INTO snapshot(log_name, aggregate_id, seq_nr, state, schema_hash)\n         VALUES ($1, $2, $3::bigint, $4::jsonb, $5)\n         ON CONFLICT (log_name, aggregate_id)\n         DO UPDATE SET seq_nr = EXCLUDED.seq_nr, state = EXCLUDED.state, schema_hash = EXCLUDED.schema_hash", [
+        name,
+        id,
+        snap.seqNr,
+        JSON.stringify(snap.state),
+        snap.schemaHash
+      ]);
+      return {
+        TAG: "Ok",
+        _0: undefined
+      };
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      return {
+        TAG: "Error",
+        _0: Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "snapshot write error")
+      };
+    }
+  };
+  let appendStream = (startingSeqNr, id, stream) => Effect.flatMap(Stream.runCollect(stream), jsons => Effect.flatMap(Effect.promise(() => appendTracked(false, startingSeqNr, id, jsons)), result => {
+    if (result.TAG === "Ok") {
+      return Effect.succeed();
+    }
+    let msg = result._0;
+    if (typeof msg !== "object") {
+      return Effect.fail("conflict");
+    } else {
+      return Effect.fail(msg._0);
+    }
+  }));
+  let ops = {
+    append: append,
+    replay: replay,
+    replayStream: replayStream,
+    appendStream: appendStream,
+    latestSnapshot: latestSnapshot,
+    writeSnapshot: writeSnapshot
+  };
+  return [
+    name,
+    ops
+  ];
+}
+
+export {
+  noTracking,
+  decodePayload,
+  coerceInt,
+  countAll,
+  isUniqueViolation,
+  makeOps,
+}
+/* Stream Not a pure module */

package/lib/bs/src/PgSchema.res

@@ -36,6 +36,19 @@ let tableStatements = [
      schema_hash   text   NOT NULL,
      PRIMARY KEY (log_name, aggregate_id)
    )",
+  // --- Classic change feed (B2.5) ---
+  // Stamp every classic event with its committing xid8 so the feed can apply the
+  // same xmin read barrier the DCB feed uses — global_seq (an IDENTITY assigned at
+  // INSERT, before commit) is unsafe as a feed cursor on its own (a late-committing
+  // lower global_seq would be skipped). Idempotent; the volatile default auto-stamps
+  // every future insert with no change to EventLogStorage_Postgres.append.
+  "ALTER TABLE event_log ADD COLUMN IF NOT EXISTS transaction_id xid8 NOT NULL DEFAULT pg_current_xact_id()",
+  "CREATE INDEX IF NOT EXISTS event_log_tx_gseq ON event_log (log_name, transaction_id, global_seq)",
+  "CREATE TABLE IF NOT EXISTS event_log_subscription (
+     subscriber      text   PRIMARY KEY,
+     last_tx         xid8   NOT NULL DEFAULT '0'::xid8,
+     last_global_seq bigint NOT NULL DEFAULT 0
+   )",
   // --- DCB event log (Phase B) ---
   "CREATE TABLE IF NOT EXISTS dcb_event (
      log_name        text        NOT NULL,
@@ -236,7 +249,28 @@ END;
 $fn$;
 "
 
-let functionStatements = [dcbConditionWhereFn, dcbAppendFn]
+// Classic change-feed wakeup (B2.5). A statement-level AFTER INSERT trigger fires
+// one pg_notify per distinct log_name touched by the statement, so the classic feed
+// gets the same near-real-time wakeup the DCB append's inline pg_notify provides —
+// without touching EventLogStorage_Postgres.append. No-op if nobody is LISTENing; a
+// low-frequency fallback tick in the consumer covers missed notifications.
+let eventLogNotifyFn = "
+CREATE OR REPLACE FUNCTION event_log_notify() RETURNS trigger
+LANGUAGE plpgsql AS $fn$
+BEGIN
+  PERFORM pg_notify('evlog_' || log_name, '')
+    FROM (SELECT DISTINCT log_name FROM new_rows) s;
+  RETURN NULL;
+END;
+$fn$;
+
+CREATE OR REPLACE TRIGGER event_log_notify_trg
+  AFTER INSERT ON event_log
+  REFERENCING NEW TABLE AS new_rows
+  FOR EACH STATEMENT EXECUTE FUNCTION event_log_notify();
+"
+
+let functionStatements = [dcbConditionWhereFn, dcbAppendFn, eventLogNotifyFn]
 
 let ensureSchema = async (pool: PgDriver.pool): unit => {
   for i in 0 to tableStatements->Array.length - 1 {
@@ -251,6 +285,6 @@ let ensureSchema = async (pool: PgDriver.pool): unit => {
 // Mirrors the reventless-local contract that reset wipes data, not structure.
 let truncateAll = async (pool: PgDriver.pool): unit => {
   await pool->PgDriver.exec(
-    "TRUNCATE event_log, snapshot, dcb_event, dcb_scope, dcb_subscription RESTART IDENTITY",
+    "TRUNCATE event_log, snapshot, dcb_event, dcb_scope, dcb_subscription, event_log_subscription RESTART IDENTITY",
   )
 }

package/lib/bs/src/PgSchema.res.mjs

@@ -5,6 +5,9 @@ import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
 let tableStatements = [
   "CREATE TABLE IF NOT EXISTS event_log (\n     log_name      text   NOT NULL,\n     aggregate_id  text   NOT NULL,\n     seq_nr        bigint NOT NULL,\n     payload       jsonb  NOT NULL,\n     msg_id        text,\n     global_seq    bigint GENERATED ALWAYS AS IDENTITY,\n     PRIMARY KEY (log_name, aggregate_id, seq_nr)\n   )",
   "CREATE TABLE IF NOT EXISTS snapshot (\n     log_name      text   NOT NULL,\n     aggregate_id  text   NOT NULL,\n     seq_nr        bigint NOT NULL,\n     state         jsonb  NOT NULL,\n     schema_hash   text   NOT NULL,\n     PRIMARY KEY (log_name, aggregate_id)\n   )",
+  "ALTER TABLE event_log ADD COLUMN IF NOT EXISTS transaction_id xid8 NOT NULL DEFAULT pg_current_xact_id()",
+  "CREATE INDEX IF NOT EXISTS event_log_tx_gseq ON event_log (log_name, transaction_id, global_seq)",
+  "CREATE TABLE IF NOT EXISTS event_log_subscription (\n     subscriber      text   PRIMARY KEY,\n     last_tx         xid8   NOT NULL DEFAULT '0'::xid8,\n     last_global_seq bigint NOT NULL DEFAULT 0\n   )",
   "CREATE TABLE IF NOT EXISTS dcb_event (\n     log_name        text        NOT NULL,\n     position        bigint      GENERATED ALWAYS AS IDENTITY,\n     transaction_id  xid8        NOT NULL DEFAULT pg_current_xact_id(),\n     event_type      text        NOT NULL,\n     tags            text[]      NOT NULL DEFAULT '{}',\n     data            jsonb       NOT NULL,\n     meta            jsonb       NOT NULL,\n     recorded_at     timestamptz NOT NULL DEFAULT now(),\n     PRIMARY KEY (log_name, position)\n   )",
   "CREATE INDEX IF NOT EXISTS dcb_event_tags_gin ON dcb_event USING gin (tags)",
   "CREATE INDEX IF NOT EXISTS dcb_event_type_pos ON dcb_event (log_name, event_type, position)",
@@ -17,9 +20,12 @@ let dcbConditionWhereFn = "\nCREATE OR REPLACE FUNCTION dcb_after_frag(p_tx xid8
 
 let dcbAppendFn = "\nCREATE OR REPLACE FUNCTION dcb_append(\n  p_log_name      text,\n  p_events        jsonb,\n  p_condition     jsonb DEFAULT NULL,\n  p_lock_strategy text  DEFAULT 'advisory'\n) RETURNS text\nLANGUAGE plpgsql AS $fn$\nDECLARE\n  v_lock_keys bigint[];\n  v_after_raw text;\n  v_after_tx  xid8;\n  v_after_pos bigint;\n  v_where     text;\n  v_conflict  boolean;\n  v_last_pos  bigint;\n  v_key       bigint;\nBEGIN\n  -- 1. Lock keys: every tag in written events UNION every tag in the condition.\n  SELECT array_agg(DISTINCT k ORDER BY k) INTO v_lock_keys\n  FROM (\n    SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n      FROM jsonb_array_elements(p_events) ev,\n           jsonb_array_elements_text(ev->'tags') tag\n    UNION\n    SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n      FROM jsonb_array_elements(COALESCE(p_condition->'query', '[]'::jsonb)) qi,\n           jsonb_array_elements_text(COALESCE(qi->'tags', '[]'::jsonb)) tag\n  ) s;\n\n  -- 2. Acquire in sorted order.\n  IF v_lock_keys IS NOT NULL THEN\n    IF p_lock_strategy = 'rows' THEN\n      INSERT INTO dcb_scope(log_name, scope_hash)\n        SELECT p_log_name, k FROM unnest(v_lock_keys) k\n        ON CONFLICT DO NOTHING;\n      PERFORM 1 FROM dcb_scope\n        WHERE log_name = p_log_name AND scope_hash = ANY(v_lock_keys)\n        ORDER BY scope_hash\n        FOR UPDATE;\n    ELSE\n      FOREACH v_key IN ARRAY v_lock_keys LOOP\n        PERFORM pg_advisory_xact_lock(v_key);\n      END LOOP;\n    END IF;\n  END IF;\n\n  -- 3. Exact condition check under the held locks (READ COMMITTED is race-free\n  --    here: a conflicting concurrent writer is either committed+visible or\n  --    blocked on our lock).\n  IF p_condition IS NOT NULL THEN\n    v_after_raw := NULLIF(p_condition->>'after', '');\n    IF v_after_raw IS NOT NULL THEN\n      -- Cursor is '<xid8>:<position>', each zero-padded to 20 digits. Strip the\n      -- padding before casting (bigint tolerates leading zeros; be explicit for\n      -- xid8, guarding the all-zeros case).\n      v_after_tx  := COALESCE(NULLIF(ltrim(split_part(v_after_raw, ':', 1), '0'), ''), '0')::xid8;\n      v_after_pos := split_part(v_after_raw, ':', 2)::bigint;\n    END IF;\n    v_where := dcb_condition_where(p_log_name, p_condition->'query', v_after_tx, v_after_pos);\n    EXECUTE 'SELECT EXISTS (SELECT 1 FROM dcb_event WHERE ' || v_where || ')'\n      INTO v_conflict;\n    IF v_conflict THEN\n      RAISE EXCEPTION 'dcb_conflict' USING ERRCODE = 'P0001';\n    END IF;\n  END IF;\n\n  -- 4. Insert every event in array order; positions come from the IDENTITY seq.\n  WITH ins AS (\n    INSERT INTO dcb_event(log_name, event_type, tags, data, meta)\n    SELECT p_log_name,\n           ev->>'event_type',\n           ARRAY(SELECT jsonb_array_elements_text(ev->'tags')),\n           ev->'data',\n           ev->'meta'\n      FROM jsonb_array_elements(p_events) WITH ORDINALITY AS t(ev, ord)\n     ORDER BY ord\n    RETURNING position\n  )\n  SELECT max(position) INTO v_last_pos FROM ins;\n\n  -- 5. Wake the change feed (Phase D). No-op if nobody is LISTENing.\n  PERFORM pg_notify('dcb_' || p_log_name, v_last_pos::text);\n\n  RETURN lpad(pg_current_xact_id()::text, 20, '0') || ':' || lpad(v_last_pos::text, 20, '0');\nEND;\n$fn$;\n";
 
+let eventLogNotifyFn = "\nCREATE OR REPLACE FUNCTION event_log_notify() RETURNS trigger\nLANGUAGE plpgsql AS $fn$\nBEGIN\n  PERFORM pg_notify('evlog_' || log_name, '')\n    FROM (SELECT DISTINCT log_name FROM new_rows) s;\n  RETURN NULL;\nEND;\n$fn$;\n\nCREATE OR REPLACE TRIGGER event_log_notify_trg\n  AFTER INSERT ON event_log\n  REFERENCING NEW TABLE AS new_rows\n  FOR EACH STATEMENT EXECUTE FUNCTION event_log_notify();\n";
+
 let functionStatements = [
   dcbConditionWhereFn,
-  dcbAppendFn
+  dcbAppendFn,
+  eventLogNotifyFn
 ];
 
 async function ensureSchema(pool) {
@@ -32,13 +38,14 @@ async function ensureSchema(pool) {
 }
 
 async function truncateAll(pool) {
-  return await PgDriver$ReventlessPostgres.exec(pool, "TRUNCATE event_log, snapshot, dcb_event, dcb_scope, dcb_subscription RESTART IDENTITY");
+  return await PgDriver$ReventlessPostgres.exec(pool, "TRUNCATE event_log, snapshot, dcb_event, dcb_scope, dcb_subscription, event_log_subscription RESTART IDENTITY");
 }
 
 export {
   tableStatements,
   dcbConditionWhereFn,
   dcbAppendFn,
+  eventLogNotifyFn,
   functionStatements,
   ensureSchema,
   truncateAll,

package/lib/bs/src/QueryDbStorage_Postgres.res

@@ -1,101 +1,16 @@
-// Postgres-backed QueryDb storage — JSONB document tables, one per read model.
+// Deploy/local wrapper over the runtime-pure QueryDbStorage_Postgres_Ops.
 //
-// Implements the clean QueryDb_Adapter.storageMaker (the shape
-// QueryDbStorage_DynamoDb implements): no in-process bus. The reventless-local
-// bridge that publishes state-changes to live GraphQL subscriptions wraps this
-// at integration time (Phase E), the way QueryDbStorage_Sqlite wraps its data
-// access today.
-//
-// Table `qdb_<name>`: partition_key text, sub_key text, item jsonb, expires_at
-// double precision (unix epoch seconds; null = never), PRIMARY KEY
-// (partition_key, sub_key). `item jsonb` returns already parsed. TTL is lazy —
-// every read carries `(expires_at IS NULL OR expires_at > epoch_now)`.
-//
-// GSI: each declared indexConfig becomes an expression index on `item->>'field'`
-// (composite keys concatenated with the configured separator). projectionType is
-// irrelevant in a relational store (every column is on the same row).
+// `makeOperations` + all SQL helpers live in QueryDbStorage_Postgres_Ops, which
+// imports NO `@pulumi/pulumi` so the deployed-Lambda runtime binds ops without
+// dragging a deploy-time dep into its ESM import graph. This module `include`s
+// that pure module (so every existing `QueryDbStorage_Postgres.*` reference keeps
+// working) and adds only the deploy-time `Pulumi.Output`-shaped `storage` record
+// and the `Make` provider functor.
+// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel
-
-let tableName = (name: string): string => "qdb_" ++ name->String.replaceAll("-", "_")
-
-// Collapse anything outside [A-Za-z0-9_] to _ — predictable, injection-safe idents.
-let sanitizeIdent = (s: string): string =>
-  s->String.replaceRegExp(%re("/[^A-Za-z0-9_]/g"), "_")
-
-let notExpiredClause = "(expires_at IS NULL OR expires_at > extract(epoch from now()))"
-
-// JSONB text extraction for a single top-level field.
-let jsonField = (field: string): string =>
-  `(item->>'${field->String.replaceAll("'", "''")}')`
-
-let compositeExpr = (fields: array<string>, sep: string): string => {
-  let escapedSep = sep->String.replaceAll("'", "''")
-  fields->Array.map(jsonField)->Array.join(` || '${escapedSep}' || `)
-}
-
-let indexExpressions = (idx: indexConfig): (string, option<string>) => {
-  let pkExpr = switch idx.pkFields {
-  | Some(fields) if fields->Array.length > 0 => compositeExpr(fields, idx.pkSep->Option.getOr("/"))
-  | _ =>
-    switch idx.idField {
-    | Some(field) => jsonField(field)
-    | None => jsonField(idx.index)
-    }
-  }
-  let skExpr = switch idx.skFields {
-  | Some(fields) if fields->Array.length > 0 =>
-    Some(compositeExpr(fields, idx.skSep->Option.getOr("/")))
-  | _ =>
-    switch idx.subIdField {
-    | Some(field) => Some(jsonField(field))
-    | None => None
-    }
-  }
-  (pkExpr, skExpr)
-}
-
-let ensureTable = async (~pool, ~table) => {
-  await pool->PgDriver.exec(
-    `CREATE TABLE IF NOT EXISTS ${table} (partition_key text NOT NULL, sub_key text NOT NULL DEFAULT '', item jsonb NOT NULL, expires_at double precision, PRIMARY KEY (partition_key, sub_key))`,
-  )
-}
-
-let ensureIndexes = async (~pool, ~table, ~indexes: array<indexConfig>) => {
-  for i in 0 to indexes->Array.length - 1 {
-    let idx = indexes->Array.getUnsafe(i)
-    let (pkExpr, skExprOpt) = indexExpressions(idx)
-    let indexName = `idx_${table}_${sanitizeIdent(idx.index)}`
-    let cols = switch skExprOpt {
-    | Some(skExpr) => `${pkExpr}, ${skExpr}`
-    | None => pkExpr
-    }
-    await pool->PgDriver.exec(`CREATE INDEX IF NOT EXISTS ${indexName} ON ${table} (${cols})`)
-  }
-}
-
-let decodeItem = (row: dict<JSON.t>): JSON.t =>
-  row->Dict.get("item")->Option.getOr(JSON.Encode.null)
-
-let computeSubKey = (item: JSON.t, subIdField: option<string>): string =>
-  switch subIdField {
-  | None => ""
-  | Some(field) =>
-    switch item->JSON.Decode.object->Option.flatMap(o => o->Dict.get(field)) {
-    | Some(JSON.String(s)) => s
-    | _ => ""
-    }
-  }
-
-let withId = (item: JSON.t, partitionKey: string): JSON.t =>
-  switch item->JSON.Decode.object {
-  | Some(obj) if obj->Dict.get("id")->Option.isNone =>
-    let copy = Dict.copy(obj)
-    copy->Dict.set("id", JSON.Encode.string(partitionKey))
-    JSON.Encode.object(copy)
-  | _ => item
-  }
+include QueryDbStorage_Postgres_Ops
 
 let makeStorage = (
   ~pool: PgDriver.pool,
@@ -103,127 +18,10 @@ let makeStorage = (
   ~indexes: array<indexConfig>,
   ~subIdField: option<string>,
 ): QueryDb_Adapter.storage => {
-  let table = tableName(name)
-  // Schema setup is async but makeStorage is synchronous; gate every operation on
-  // this promise so the first access waits for table + index creation exactly
-  // once (subsequent awaits resolve immediately).
-  let ready = {
-    open Promise
-    ensureTable(~pool, ~table)->then(() => ensureIndexes(~pool, ~table, ~indexes))
-  }
-
-  let rowsFor = async (id: string): array<JSON.t> => {
-    await ready
-    (await pool->PgDriver.query(
-      `SELECT item FROM ${table} WHERE partition_key = $1 AND ${notExpiredClause} ORDER BY sub_key ASC`,
-      [JSON.Encode.string(id)],
-    ))->Array.map(decodeItem)
-  }
-
-  let saveOne = async (id: string, state: JSON.t, ttl: option<int>) => {
-    await ready
-    let subKey = computeSubKey(state, subIdField)
-    let expiresAt = switch ttl {
-    | Some(t) => JSON.Encode.int(t)
-    | None => JSON.Encode.null
-    }
-    let _ = await pool->PgDriver.query(
-      `INSERT INTO ${table}(partition_key, sub_key, item, expires_at)
-       VALUES ($1, $2, $3::jsonb, $4)
-       ON CONFLICT (partition_key, sub_key)
-       DO UPDATE SET item = EXCLUDED.item, expires_at = EXCLUDED.expires_at`,
-      [
-        JSON.Encode.string(id),
-        JSON.Encode.string(subKey),
-        JSON.Encode.string(JSON.stringify(state)),
-        expiresAt,
-      ],
-    )
-  }
-
-  let load: QueryDb.load<string, JSON.t> = async id => Ok(await rowsFor(id))
-
-  let loadStream: QueryDb.loadStream<string, JSON.t> =
-    id =>
-      Effect.promise(() => rowsFor(id))
-      ->Stream.fromEffect
-      ->Stream.flatMap(arr => Stream.fromIterable(arr))
-
-  let save: QueryDb.save<string, JSON.t> = async (id, state, _saveMode, ttl) => {
-    await saveOne(id, state, ttl)
-    Ok()
-  }
-
-  let saveBatch: QueryDb.saveBatch<string, JSON.t> = async batch => {
-    // pg has no synchronous multi-statement transaction helper here; the upserts
-    // are independent (distinct keys) so a sequential apply is equivalent.
-    for i in 0 to batch->Array.length - 1 {
-      let (id, state, ttl) = batch->Array.getUnsafe(i)
-      await saveOne(id, state, ttl)
-    }
-    Ok()
-  }
-
-  // Mirror DynamoDB's `ADD #field :inc`: read the counter on the partition item
-  // (counters are single-state, sub_key=""), add inc, upsert, return NEW total.
-  let count: QueryDb.count<string> = async (id, fieldName, inc) => {
-    await ready
-    let existing = (await rowsFor(id))->Array.get(0)->Option.flatMap(JSON.Decode.object)
-    let current =
-      existing
-      ->Option.flatMap(o => o->Dict.get(fieldName))
-      ->Option.flatMap(JSON.Decode.float)
-      ->Option.mapOr(0, Float.toInt)
-    let next = current + inc
-    let obj = switch existing {
-    | Some(o) => Dict.copy(o)
-    | None => Dict.make()
-    }
-    obj->Dict.set("id", JSON.Encode.string(id))
-    obj->Dict.set(fieldName, JSON.Encode.int(next))
-    await saveOne(id, JSON.Encode.object(obj), None)
-    Ok(next)
-  }
-
-  let delete: QueryDb.delete<string> = async (id, subIdOpt) => {
-    await ready
-    let _ = switch subIdOpt {
-    | None =>
-      await pool->PgDriver.query(
-        `DELETE FROM ${table} WHERE partition_key = $1`,
-        [JSON.Encode.string(id)],
-      )
-    | Some((_, subValue)) =>
-      await pool->PgDriver.query(
-        `DELETE FROM ${table} WHERE partition_key = $1 AND sub_key = $2`,
-        [JSON.Encode.string(id), JSON.Encode.string(subValue)],
-      )
-    }
-    Ok()
-  }
-
-  let deleteBatch: QueryDb.deleteBatch<string> = async ids => {
-    for i in 0 to ids->Array.length - 1 {
-      let (id, subIdOpt) = ids->Array.getUnsafe(i)
-      let _ = await delete(id, subIdOpt)
-    }
-    Ok()
-  }
-
-  let ops: QueryDb_Adapter.operations = {
-    load,
-    loadStream,
-    save,
-    saveBatch,
-    count,
-    delete,
-    deleteBatch,
-  }
-
   {
     QueryDb_Adapter.resources: [],
     dataSourceName: ""->Pulumi.Output.make,
-    operations: Pulumi.Output.make(ops),
+    operations: Pulumi.Output.make(makeOperations(~pool, ~name, ~indexes, ~subIdField)),
   }
 }