@fragno-dev/db 0.3.0 → 0.4.1

package/src/adapters/generic-sql/generic-sql-uow-executor.ts

@@ -1,17 +1,8 @@
-import type {
-  CompiledMutation,
-  MutationResult,
-  UOWExecutor,
-} from "../../query/unit-of-work/unit-of-work";
-import type { CompiledQuery, Dialect } from "../../sql-driver/sql-driver";
-import type { SqlDriverAdapter } from "../../sql-driver/sql-driver-adapter";
-import type { DriverConfig } from "./driver-config";
-import { ResultInterpreter } from "./result-interpreter";
-import { sql } from "../../sql-driver/sql";
-import { createId } from "../../id";
 import superjson from "superjson";
-import { createColdKysely } from "./migration/cold-kysely";
+
 import { SETTINGS_NAMESPACE, internalSchema } from "../../fragments/internal-fragment.schema";
+import { createId } from "../../id";
+import { type SqlNamingStrategy } from "../../naming/sql-naming";
 import {
   type OutboxConfig,
   type OutboxRefLookup,
@@ -22,7 +13,17 @@ import {
 } from "../../outbox/outbox";
 import { buildOutboxPlan, finalizeOutboxPayload } from "../../outbox/outbox-builder";
 import { createSQLSerializer } from "../../query/serialize/create-sql-serializer";
-import { type SqlNamingStrategy } from "../../naming/sql-naming";
+import type {
+  CompiledMutation,
+  MutationResult,
+  UOWExecutor,
+} from "../../query/unit-of-work/unit-of-work";
+import { sql } from "../../sql-driver/sql";
+import type { CompiledQuery, Dialect } from "../../sql-driver/sql-driver";
+import type { SqlDriverAdapter } from "../../sql-driver/sql-driver-adapter";
+import type { DriverConfig } from "./driver-config";
+import { createColdKysely } from "./migration/cold-kysely";
+import { ResultInterpreter } from "./result-interpreter";
 
 export interface ExecutorOptions {
   dryRun?: boolean;
@@ -64,10 +65,20 @@ export async function executeMutation(
   const createdInternalIds: (bigint | null)[] = [];
   const resultInterpreter = new ResultInterpreter(driverConfig);
   const outboxEnabled = options.outbox?.enabled ?? false;
+  const shouldInclude = options.outbox?.shouldInclude;
   const namingStrategy = options.namingStrategy ?? driverConfig.defaultNamingStrategy;
 
   const outboxOperations = outboxEnabled
-    ? mutationBatch.flatMap((mutation) => (mutation.operation ? [mutation.operation] : []))
+    ? mutationBatch.flatMap((mutation) => {
+        const operation = mutation.operation;
+        if (!operation) {
+          return [];
+        }
+        if (shouldInclude && !shouldInclude(operation)) {
+          return [];
+        }
+        return [operation];
+      })
     : [];
 
   const outboxPlan = outboxOperations.length > 0 ? buildOutboxPlan(outboxOperations) : null;
@@ -142,6 +153,11 @@ export async function executeMutation(
         const payloadSerialized = superjson.serialize(payload);
         const versionstamp = versionstampToHex(encodeVersionstamp(outboxVersion, 0));
 
+        await insertOutboxMutationRows(tx, driverConfig, {
+          entryVersionstamp: versionstamp,
+          uowId,
+          mutations: payload.mutations,
+        });
         await insertOutboxRow(tx, driverConfig, {
           id: createId(),
           versionstamp,
@@ -343,7 +359,7 @@ async function insertOutboxRow(
   const values = { id, versionstamp, uowId, payload, refMap: refMapValue };
   const serializedValues: Record<string, unknown> = {};
   for (const [key, value] of Object.entries(values)) {
-    const col = outboxTable.columns[key];
+    const col = outboxTable.getColumnByName(key);
     if (!col) {
       serializedValues[key] = value;
       continue;
@@ -356,3 +372,53 @@ async function insertOutboxRow(
 
   await tx.executeQuery(query);
 }
+
+async function insertOutboxMutationRows(
+  tx: SqlDriverAdapter,
+  driverConfig: DriverConfig,
+  options: {
+    entryVersionstamp: string;
+    uowId: string;
+    mutations: {
+      versionstamp: string;
+      schema: string;
+      table: string;
+      externalId: string;
+      op: string;
+    }[];
+  },
+): Promise<void> {
+  if (options.mutations.length === 0) {
+    return;
+  }
+
+  const serializer = createSQLSerializer(driverConfig);
+  const mutationsTable = internalSchema.tables.fragno_db_outbox_mutations;
+  const db = createColdKysely(driverConfig.databaseType);
+
+  for (const mutation of options.mutations) {
+    const values = {
+      id: createId(),
+      entryVersionstamp: options.entryVersionstamp,
+      mutationVersionstamp: mutation.versionstamp,
+      uowId: options.uowId,
+      schema: mutation.schema,
+      table: mutation.table,
+      externalId: mutation.externalId,
+      op: mutation.op,
+    };
+    const serializedValues: Record<string, unknown> = {};
+
+    for (const [key, value] of Object.entries(values)) {
+      const col = mutationsTable.getColumnByName(key);
+      if (!col) {
+        serializedValues[key] = value;
+        continue;
+      }
+      serializedValues[col.name] = serializer.serialize(value, col);
+    }
+
+    const query = db.insertInto("fragno_db_outbox_mutations").values(serializedValues).compile();
+    await tx.executeQuery(query);
+  }
+}

package/src/adapters/generic-sql/migration/adapter-migration-parity.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+
 import {
   DummyDriver,
   MysqlAdapter,
@@ -8,14 +9,15 @@ import {
   SqliteAdapter,
   SqliteQueryCompiler,
 } from "kysely";
-import { SqlAdapter } from "../generic-sql-adapter";
+
+import { column, idColumn, referenceColumn, schema } from "../../../schema/create";
 import type { Dialect } from "../../../sql-driver/sql-driver";
 import {
   MySQL2DriverConfig,
   NodePostgresDriverConfig,
   SQLocalDriverConfig,
 } from "../driver-config";
-import { column, idColumn, referenceColumn, schema } from "../../../schema/create";
+import { SqlAdapter } from "../generic-sql-adapter";
 
 const paritySchema = schema("parity", (s) => {
   return s

package/src/adapters/generic-sql/migration/cold-kysely.ts

@@ -11,6 +11,7 @@ import {
   SqliteIntrospector,
   SqliteQueryCompiler,
 } from "kysely";
+
 import type { SupportedDatabase } from "../driver-config";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/adapters/generic-sql/migration/dialect/mysql.test.ts

@@ -1,9 +1,10 @@
 import { describe, expect, it } from "vitest";
+
 import type { MigrationOperation } from "../../../../migration-engine/shared";
+import { createNamingResolver, type SqlNamingStrategy } from "../../../../naming/sql-naming";
+import { column, idColumn, schema } from "../../../../schema/create";
 import { createColdKysely } from "../cold-kysely";
 import { MySQLSQLGenerator } from "./mysql";
-import { column, idColumn, schema } from "../../../../schema/create";
-import { createNamingResolver, type SqlNamingStrategy } from "../../../../naming/sql-naming";
 
 describe("MySQLSQLGenerator", () => {
   const coldKysely = createColdKysely("mysql");

package/src/adapters/generic-sql/migration/dialect/mysql.ts

@@ -1,4 +1,5 @@
 import { type ColumnDefinitionBuilder, type CompiledQuery, type RawBuilder, sql } from "kysely";
+
 import type {
   ColumnInfo,
   ColumnOperation,

package/src/adapters/generic-sql/migration/dialect/postgres.test.ts

@@ -1,9 +1,10 @@
 import { describe, expect, it } from "vitest";
+
 import type { MigrationOperation } from "../../../../migration-engine/shared";
+import { createNamingResolver, type SqlNamingStrategy } from "../../../../naming/sql-naming";
+import { column, idColumn, schema } from "../../../../schema/create";
 import { createColdKysely } from "../cold-kysely";
 import { PostgresSQLGenerator } from "./postgres";
-import { column, idColumn, schema } from "../../../../schema/create";
-import { createNamingResolver, type SqlNamingStrategy } from "../../../../naming/sql-naming";
 
 describe("PostgresSQLGenerator", () => {
   const coldKysely = createColdKysely("postgresql");
@@ -68,7 +69,7 @@ describe("PostgresSQLGenerator", () => {
         columns: [
           {
             name: "id",
-            type: "varchar(30)",
+            type: "varchar(128)",
             isNullable: false,
             role: "external-id",
             default: { runtime: "cuid" },
@@ -78,7 +79,7 @@ describe("PostgresSQLGenerator", () => {
 
       const sql = compileOne(operation);
       expect(sql).toMatchInlineSnapshot(
-        `"create table "users" ("id" varchar(30) not null unique)"`,
+        `"create table "users" ("id" varchar(128) not null unique)"`,
       );
     });
 

package/src/adapters/generic-sql/migration/dialect/postgres.ts

@@ -1,12 +1,13 @@
 import { type ColumnDefinitionBuilder, type CompiledQuery, type RawBuilder, sql } from "kysely";
+
 import type {
   ColumnInfo,
   ColumnOperation,
   MigrationOperation,
 } from "../../../../migration-engine/shared";
 import { isUpdated } from "../../../../migration-engine/shared";
-import { SQLGenerator } from "../sql-generator";
 import type { NamingResolver } from "../../../../naming/sql-naming";
+import { SQLGenerator } from "../sql-generator";
 
 const errors = {
   IdColumnUpdate: