@cosmicdrift/kumiko-framework 0.163.1 → 0.163.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-framework",
-  "version": "0.163.1",
+  "version": "0.163.2",
   "description": "Framework core — engine, pipeline, API, DB, and every other bit that makes Kumiko go.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -182,7 +182,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-types": "0.163.1",
+    "@cosmicdrift/kumiko-types": "0.163.2",
     "bullmq": "^5.76.7",
     "bun-types": "^1.3.13",
     "hono": "^4.12.18",
@@ -198,7 +198,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.163.1",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.163.2",
     "bun-types": "^1.3.13",
     "pino-pretty": "^13.1.3"
   },

package/src/db/__tests__/replay-migration-sql.test.ts

@@ -72,6 +72,54 @@ CREATE INDEX IF NOT EXISTS "read_accounts_tenant_id_idx" ON "read_accounts" ("te
     }
   });
 
+  // Regression: publicstatus#0007_fix-secrets-table-columns adds three
+  // columns in ONE statement (comma-separated ADD COLUMN clauses) — the
+  // replay used to only pick up the first, reporting "metadata" and
+  // "last_rotated_at" as missing even though the migration creates them.
+  test("multiple ADD COLUMN clauses in a single ALTER TABLE statement all extend the table", () => {
+    const dir = tmpMigrationsDir();
+    try {
+      write(dir, "0001_init.sql", `CREATE TABLE IF NOT EXISTS "read_a" ("id" uuid PRIMARY KEY);`);
+      write(
+        dir,
+        "0002_add-cols.sql",
+        `ALTER TABLE "read_a"
+  ADD COLUMN IF NOT EXISTS "envelope" jsonb NOT NULL,
+  ADD COLUMN IF NOT EXISTS "metadata" jsonb DEFAULT '{}'::jsonb NOT NULL,
+  ADD COLUMN IF NOT EXISTS "last_rotated_at" timestamp with time zone DEFAULT now() NOT NULL;`,
+      );
+      const replayed = replayMigrationsDir(dir);
+      expect([...(replayed.get("read_a")?.columns ?? [])].sort()).toEqual([
+        "envelope",
+        "id",
+        "last_rotated_at",
+        "metadata",
+      ]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("mixed ADD + DROP COLUMN clauses in one statement apply in order", () => {
+    const dir = tmpMigrationsDir();
+    try {
+      write(
+        dir,
+        "0001_init.sql",
+        `CREATE TABLE IF NOT EXISTS "read_a" ("id" uuid PRIMARY KEY, "legacy" text);`,
+      );
+      write(
+        dir,
+        "0002_migrate-cols.sql",
+        `ALTER TABLE "read_a" DROP COLUMN IF EXISTS "legacy", ADD COLUMN IF NOT EXISTS "title" text;`,
+      );
+      const replayed = replayMigrationsDir(dir);
+      expect([...(replayed.get("read_a")?.columns ?? [])].sort()).toEqual(["id", "title"]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
   test("DROP COLUMN IF EXISTS (hand-edited) still removes the column", () => {
     const dir = tmpMigrationsDir();
     try {

package/src/db/replay-migration-sql.ts

@@ -54,37 +54,40 @@ function applyStatement(schema: Map<string, { columns: Set<string> }>, statement
   const create = statement.match(
     /^CREATE TABLE\s+(?:IF NOT EXISTS\s+)?"([^"]+)"\s*\(([\s\S]*)\);?\s*$/i,
   );
-  const createTableName = create?.[1];
-  const createBody = create?.[2];
-
-  const addColumn = statement.match(
-    /^ALTER TABLE\s+"([^"]+)"\s+ADD COLUMN\s+(?:IF NOT EXISTS\s+)?"([^"]+)"/i,
-  );
-  const addColumnTable = addColumn?.[1];
-  const addColumnName = addColumn?.[2];
+  if (create?.[1] !== undefined && create[2] !== undefined) {
+    schema.set(create[1], { columns: parseColumnNames(create[2]) });
+    // skip: CREATE TABLE fully handled above, no other clause can also match
+    return;
+  }
 
   const dropTable = statement.match(/^DROP TABLE\s+(?:IF EXISTS\s+)?"([^"]+)"/i);
-  const dropTableName = dropTable?.[1];
-
-  const dropColumn = statement.match(
-    /^ALTER TABLE\s+"([^"]+)"\s+DROP COLUMN\s+(?:IF EXISTS\s+)?"([^"]+)"/i,
-  );
-  const dropColumnTable = dropColumn?.[1];
-  const dropColumnName = dropColumn?.[2];
+  if (dropTable?.[1] !== undefined) {
+    schema.delete(dropTable[1]);
+    // skip: DROP TABLE fully handled above, no other clause can also match
+    return;
+  }
 
-  if (createTableName !== undefined && createBody !== undefined) {
-    schema.set(createTableName, { columns: parseColumnNames(createBody) });
-  } else if (addColumnTable !== undefined && addColumnName !== undefined) {
-    const table = schema.get(addColumnTable);
-    if (table) table.columns.add(addColumnName);
-    else schema.set(addColumnTable, { columns: new Set([addColumnName]) });
-  } else if (dropTableName !== undefined) {
-    schema.delete(dropTableName);
-  } else if (dropColumnTable !== undefined && dropColumnName !== undefined) {
-    schema.get(dropColumnTable)?.columns.delete(dropColumnName);
+  // A single ALTER TABLE statement can carry multiple comma-separated
+  // ADD/DROP COLUMN clauses (e.g. migration 0007_fix-secrets-table-columns'
+  // three-column fix in one statement) — matchAll over the whole body
+  // instead of matching only the first clause, in statement order so an
+  // add-then-drop of the same column (unusual, but not impossible) resolves
+  // correctly.
+  const alterTable = statement.match(/^ALTER TABLE\s+"([^"]+)"\s+([\s\S]*?);?\s*$/i);
+  const alterTableName = alterTable?.[1];
+  const alterBody = alterTable?.[2];
+  if (alterTableName !== undefined && alterBody !== undefined) {
+    const table = schema.get(alterTableName) ?? { columns: new Set<string>() };
+    schema.set(alterTableName, table);
+    const clauseRe = /(ADD|DROP)\s+COLUMN\s+(?:IF (?:NOT )?EXISTS\s+)?"([^"]+)"/gi;
+    for (const [, verb, name] of alterBody.matchAll(clauseRe)) {
+      if (verb === undefined || name === undefined) continue;
+      if (verb.toUpperCase() === "ADD") table.columns.add(name);
+      else table.columns.delete(name);
+    }
   }
-  // else: CREATE INDEX, ALTER COLUMN (TYPE/DEFAULT/NOT NULL) and everything
-  // else don't change the table/column shape this replay tracks.
+  // else: CREATE INDEX and everything else don't change the table/column
+  // shape this replay tracks.
 }
 
 // Reads `<migrationsDir>/*.sql` in sequence order and replays every