@sixb/pg 0.1.1 → 0.1.3

package/src/ontology-storage/materializations.ts

@@ -594,6 +594,7 @@ export class PgOntologyMaterializationStorage implements OntologyMaterialization
           payload->'ref'->>'linkId' AS link_id
         FROM ${this.sql(PG_MATERIALIZATION_WORK_TABLE)}
         WHERE session_id = ${session.id} AND kind = 'cardinality'
+          AND payload->>'view' = 'effective'
       ), duplicate AS (
         SELECT scope_sort_key FROM work WHERE occupied
         GROUP BY scope_sort_key HAVING COUNT(*) > 1
@@ -836,12 +837,13 @@ export class PgOntologyMaterializationStorage implements OntologyMaterialization
     const actor = commit.actor === undefined ? null : jsonParameter(this.sql, commit.actor)
     const rows = await this.sql<PgOntologyCommitRow[]>`
       INSERT INTO ontology_commits (
-        project_id, id, idempotency_key, request_hash,
+        project_id, id, idempotency_key, request_hash, execution_id,
         origin_kind, origin_run_id, origin_batch_ordinal, origin, actor,
         ontology_revision, projection_revision, ownership_hash,
         intent, result, committed_at
       ) VALUES (
         ${commit.projectId}, ${commit.id}, ${commit.idempotencyKey}, ${commit.requestHash},
+        ${commit.executionId},
         ${origin.kind}, ${origin.runId}, ${origin.batchOrdinal},
         ${jsonParameter(this.sql, commit.origin)}, ${actor}, ${commit.ontologyRevision},
         ${commit.projectionRevision ?? null}, ${commit.ownershipHash ?? null},

package/src/ontology-storage/outbox.ts

@@ -1,3 +1,4 @@
+import { serializeSixbFailure } from "@sixb/core/internal/errors"
 import {
   MaterializationConflictError,
   MaterializationValidationError,
@@ -12,6 +13,7 @@ import type {
   RescheduleOntologyOutboxLeaseInput,
   SummarizeOntologyOutboxInput,
 } from "@sixb/core/storage"
+import { ONTOLOGY_OUTBOX_FAILURE_CODES } from "@sixb/core/storage"
 import {
   assertNonblank,
   assertPositiveInteger,
@@ -57,7 +59,7 @@ export class PgOntologyOutboxStorage implements OntologyOutboxStorage {
           WHERE outbox.project_id = candidates.project_id AND outbox.id = candidates.id
           RETURNING outbox.id AS row_id, outbox.envelope, outbox.available_at,
             outbox.attempts, outbox.lease_id, outbox.lease_expires_at,
-            outbox.published_at, outbox.last_error, outbox.created_at,
+            outbox.published_at, outbox.last_failure, outbox.created_at,
             outbox.commit_id, outbox.commit_ordinal
         )
         SELECT * FROM claimed ORDER BY created_at, commit_id, commit_ordinal
@@ -109,6 +111,10 @@ export class PgOntologyOutboxStorage implements OntologyOutboxStorage {
       assertTimestamp(input.availableAt, "Ontology outbox availableAt")
       const ids = validateLeaseIds(input.ids)
       if (ids.length === 0) return
+      const failure =
+        input.failure === undefined
+          ? null
+          : serializeSixbFailure(input.failure, ONTOLOGY_OUTBOX_FAILURE_CODES)
       const rows = await sql<{ readonly id: string }[]>`
         WITH leased AS MATERIALIZED (
           SELECT id FROM ontology_outbox
@@ -122,7 +128,8 @@ export class PgOntologyOutboxStorage implements OntologyOutboxStorage {
           WHERE (SELECT COUNT(*) FROM leased) = ${ids.length}
         )
         UPDATE ontology_outbox AS outbox
-        SET available_at = ${input.availableAt}, last_error = ${input.error},
+        SET available_at = ${input.availableAt},
+          last_failure = COALESCE(${failure}::text::jsonb, outbox.last_failure),
           lease_id = NULL, lease_expires_at = NULL
         FROM eligible
         WHERE outbox.project_id = ${input.projectId} AND outbox.id = eligible.id

package/src/ontology-storage/shared.ts

@@ -1,3 +1,4 @@
+import { parseSixbFailure } from "@sixb/core/internal/errors"
 import type { ProjectionEntityRef } from "@sixb/core/internal/materialization"
 import { MaterializationConflictError } from "@sixb/core/internal/materialization"
 import type {
@@ -8,6 +9,7 @@ import type {
   OntologySourceRecord,
   StageSourceAssertion,
 } from "@sixb/core/storage"
+import { ONTOLOGY_OUTBOX_FAILURE_CODES } from "@sixb/core/storage"
 import type { SQLClient } from "../pg-client"
 
 export {
@@ -32,6 +34,7 @@ export interface PgOntologyCommitRow {
   readonly id: string
   readonly idempotency_key: string
   readonly request_hash: string
+  readonly execution_id: string
   readonly origin_kind: string
   readonly origin_run_id: string | null
   readonly origin_batch_ordinal: number | string | null
@@ -85,8 +88,7 @@ export interface PgOntologySourceAssertionRow {
   readonly assertion: unknown
 }
 
-export interface PgOntologyOverrideRow {
-  readonly entity_kind: "object" | "link"
+export interface PgStoredOverrideRow {
   readonly value: unknown
   readonly last_commit_id: string
   readonly updated_at: Date | string
@@ -99,7 +101,7 @@ export interface PgOntologyOutboxRow {
   readonly lease_id: string | null
   readonly lease_expires_at: Date | string | null
   readonly published_at: Date | string | null
-  readonly last_error: string | null
+  readonly last_failure: unknown | null
   readonly created_at: Date | string
 }
 
@@ -107,13 +109,6 @@ export function jsonParameter(sql: SQLClient, value: unknown): ReturnType<SQLCli
   return sql.json(value as PgJsonValue)
 }
 
-export function jsonKeyParameter(
-  sql: SQLClient,
-  canonicalKey: string
-): ReturnType<SQLClient["json"]> {
-  return jsonParameter(sql, JSON.parse(canonicalKey))
-}
-
 export function toIsoString(value: Date | string): string {
   return value instanceof Date ? value.toISOString() : new Date(value).toISOString()
 }
@@ -180,6 +175,7 @@ export function commitRecord(row: PgOntologyCommitRow): OntologyCommitRecord {
     id: row.id,
     idempotencyKey: row.idempotency_key,
     requestHash: row.request_hash,
+    executionId: row.execution_id,
     origin: structuredClone(row.origin) as OntologyCommitWrite["origin"],
     ...(row.actor === null
       ? {}
@@ -204,7 +200,10 @@ export function outboxRecord(row: PgOntologyOutboxRow): OntologyOutboxRecord {
     leaseId: row.lease_id,
     leaseExpiresAt: optionalIsoString(row.lease_expires_at),
     publishedAt: optionalIsoString(row.published_at),
-    lastError: row.last_error,
+    lastFailure:
+      row.last_failure === null
+        ? null
+        : parseSixbFailure(row.last_failure, ONTOLOGY_OUTBOX_FAILURE_CODES),
     createdAt: toIsoString(row.created_at),
   }
 }
@@ -279,15 +278,6 @@ export async function assertProjectionExecution(
   }
 }
 
-export function requireRow<T>(
-  row: T | undefined,
-  kind: ConstructorParameters<typeof MaterializationConflictError>[0],
-  message: string
-): T {
-  if (!row) throw new MaterializationConflictError(kind, message)
-  return row
-}
-
 export function ontologyLockKey(kind: string, ...parts: readonly string[]): string {
   return `ontology:${kind}:${JSON.stringify(parts)}`
 }

package/src/pg-action-run-storage.ts

@@ -1,4 +1,9 @@
 import type { ActionSubject, JsonValue } from "@sixb/core"
+import {
+  parseActionRunFailure,
+  serializeActionRunFailure,
+} from "@sixb/core/internal/action-run-storage"
+import { assertActionRunExecution } from "@sixb/core/internal/action-run-storage-provider"
 import type {
   ActionRunEffectsRecord,
   ActionRunFailure,
@@ -8,6 +13,7 @@ import type {
   ActionRunStorage,
   ActionRunWritebackRecord,
   EnterActionRunPhaseInput,
+  ExecutionStorage,
   FinishActionRunInput,
   ListActionRunsInput,
   ListActionRunsResult,
@@ -29,7 +35,10 @@ import { isUniqueViolation } from "./storage-errors"
 import { type PgStoreClient, runPgTransaction } from "./transactions"
 
 export class PgActionRunStorage implements ActionRunStorage {
-  constructor(private readonly sql: PgStoreClient) {}
+  constructor(
+    private readonly sql: PgStoreClient,
+    private readonly executions: ExecutionStorage
+  ) {}
 
   async lockForMaterialization(input: LockActionMaterializationRunInput): Promise<ActionRunRecord> {
     const [row] = await this.sql<DatabaseRow[]>`
@@ -57,11 +66,20 @@ export class PgActionRunStorage implements ActionRunStorage {
   }
 
   async queue(input: QueueActionRunInput): Promise<ActionRunRecord> {
+    await assertActionRunExecution({
+      executions: this.executions,
+      projectId: input.projectId,
+      executionId: input.executionId,
+      runId: input.id,
+      actionId: input.actionId,
+    })
+
     try {
       const [row] = await this.sql<DatabaseRow[]>`
         INSERT INTO action_runs (
           project_id,
           id,
+          execution_id,
           action_id,
           subject_kind,
           object_type_id,
@@ -76,20 +94,15 @@ export class PgActionRunStorage implements ActionRunStorage {
           writeback_status,
           writeback_completed_at,
           writeback_result,
-          writeback_error_name,
-          writeback_error_message,
-          writeback_error_phase,
+          writeback_error,
           effects_status,
           effects_completed_at,
-          effects_error_name,
-          effects_error_message,
-          effects_error_phase,
-          error_name,
-          error_message,
-          error_phase
+          effects_error,
+          error
         ) VALUES (
           ${input.projectId},
           ${input.id},
+          ${input.executionId},
           ${input.actionId},
           ${input.subject.kind},
           ${input.subject.kind === "object" ? input.subject.objectTypeId : null},
@@ -108,12 +121,6 @@ export class PgActionRunStorage implements ActionRunStorage {
           ${null},
           ${null},
           ${null},
-          ${null},
-          ${null},
-          ${null},
-          ${null},
-          ${null},
-          ${null},
           ${null}
         )
         RETURNING *
@@ -157,17 +164,11 @@ export class PgActionRunStorage implements ActionRunStorage {
           writeback_status = ${null},
           writeback_completed_at = ${null},
           writeback_result = ${null},
-          writeback_error_name = ${null},
-          writeback_error_message = ${null},
-          writeback_error_phase = ${null},
+          writeback_error = ${null},
           effects_status = ${null},
           effects_completed_at = ${null},
-          effects_error_name = ${null},
-          effects_error_message = ${null},
-          effects_error_phase = ${null},
-          error_name = ${null},
-          error_message = ${null},
-          error_phase = ${null}
+          effects_error = ${null},
+          error = ${null}
         WHERE project_id = ${input.projectId} AND id = ${input.id}
         RETURNING *
       `
@@ -183,9 +184,7 @@ export class PgActionRunStorage implements ActionRunStorage {
         status = ${"running"},
         phase = ${input.phase ?? "validation"},
         started_at = ${input.startedAt ?? new Date()},
-        error_name = ${null},
-        error_message = ${null},
-        error_phase = ${null}
+        error = ${null}
       WHERE project_id = ${input.projectId}
         AND id = ${input.id}
         AND status = ${"queued"}
@@ -251,9 +250,7 @@ export class PgActionRunStorage implements ActionRunStorage {
           writeback_status = ${input.status},
           writeback_completed_at = ${nextWriteback.completedAt},
           writeback_result = ${input.status === "succeeded" ? JSON.stringify(input.result) : null}::text::jsonb,
-          writeback_error_name = ${input.status === "failed" ? (input.error.name ?? null) : null},
-          writeback_error_message = ${input.status === "failed" ? input.error.message : null},
-          writeback_error_phase = ${input.status === "failed" ? (input.error.phase ?? "writeback") : null}
+          writeback_error = ${input.status === "failed" ? serializeActionRunFailure(input.error, "writeback") : null}::text::jsonb
         WHERE project_id = ${input.projectId} AND id = ${input.id}
         RETURNING *
       `
@@ -284,9 +281,7 @@ export class PgActionRunStorage implements ActionRunStorage {
           phase = ${"effects"},
           effects_status = ${input.status},
           effects_completed_at = ${nextEffects.completedAt},
-          effects_error_name = ${input.status === "failed" ? (input.error.name ?? null) : null},
-          effects_error_message = ${input.status === "failed" ? input.error.message : null},
-          effects_error_phase = ${input.status === "failed" ? (input.error.phase ?? "effects") : null}
+          effects_error = ${input.status === "failed" ? serializeActionRunFailure(input.error, "effects") : null}::text::jsonb
         WHERE project_id = ${input.projectId} AND id = ${input.id}
         RETURNING *
       `
@@ -323,9 +318,7 @@ export class PgActionRunStorage implements ActionRunStorage {
           status = ${input.status},
           phase = ${phase},
           finished_at = ${input.finishedAt ?? new Date()},
-          error_name = ${input.status === "succeeded" ? null : (input.error?.name ?? null)},
-          error_message = ${input.status === "succeeded" ? null : (input.error?.message ?? null)},
-          error_phase = ${input.status === "succeeded" ? null : (input.error?.phase ?? phase)}
+          error = ${input.status === "succeeded" ? null : serializeActionRunFailure(input.error)}::text::jsonb
         WHERE project_id = ${input.projectId} AND id = ${input.id}
         RETURNING *
       `
@@ -484,23 +477,14 @@ export class PgActionRunStorage implements ActionRunStorage {
 }
 
 function toActionRunFailure(row: DatabaseRow): ActionRunFailure | undefined {
-  return toFailure(row.error_name, row.error_message, row.error_phase)
+  return row.error === null ? undefined : parseActionRunFailure(row.error)
 }
 
-function toFailure(
-  name: string | null,
-  message: string | null,
-  phase: ActionRunPhase | null
-): ActionRunFailure | undefined {
-  if (!message) {
-    return undefined
-  }
-
-  return {
-    name: name ?? undefined,
-    message,
-    phase: phase ?? undefined,
-  }
+function parsePhaseFailure<TPhase extends Extract<ActionRunPhase, "writeback" | "effects">>(
+  value: unknown,
+  expectedPhase: TPhase
+): ActionRunFailure<TPhase> {
+  return parseActionRunFailure(value, expectedPhase)
 }
 
 function toActionRunWritebackRecord(row: DatabaseRow): ActionRunWritebackRecord | undefined {
@@ -523,11 +507,7 @@ function toActionRunWritebackRecord(row: DatabaseRow): ActionRunWritebackRecord
   return {
     status: "failed",
     completedAt,
-    error: toFailure(
-      row.writeback_error_name,
-      row.writeback_error_message,
-      row.writeback_error_phase
-    ),
+    error: parsePhaseFailure(row.writeback_error, "writeback"),
   }
 }
 
@@ -550,7 +530,7 @@ function toActionRunEffectsRecord(row: DatabaseRow): ActionRunEffectsRecord | un
   return {
     status: "failed",
     completedAt,
-    error: toFailure(row.effects_error_name, row.effects_error_message, row.effects_error_phase),
+    error: parsePhaseFailure(row.effects_error, "effects"),
   }
 }
 
@@ -595,6 +575,7 @@ function rowToActionRunRecord(row: DatabaseRow): ActionRunRecord {
   return {
     id: row.id,
     projectId: row.project_id,
+    executionId: row.execution_id,
     actionId: row.action_id,
     subject: rowToActionSubject(row),
     status: row.status,
@@ -629,6 +610,7 @@ function rowToActionSubject(row: DatabaseRow): ActionSubject {
 interface DatabaseRow {
   project_id: string
   id: string
+  execution_id: string
   action_id: string
   subject_kind: ActionSubject["kind"]
   object_type_id: string | null
@@ -643,15 +625,9 @@ interface DatabaseRow {
   writeback_status: ActionRunWritebackRecord["status"] | null
   writeback_completed_at: Date | string | null
   writeback_result: JsonValue | null
-  writeback_error_name: string | null
-  writeback_error_message: string | null
-  writeback_error_phase: ActionRunPhase | null
+  writeback_error: unknown | null
   effects_status: ActionRunEffectsRecord["status"] | null
   effects_completed_at: Date | string | null
-  effects_error_name: string | null
-  effects_error_message: string | null
-  effects_error_phase: ActionRunPhase | null
-  error_name: string | null
-  error_message: string | null
-  error_phase: ActionRunPhase | null
+  effects_error: unknown | null
+  error: unknown | null
 }