fix(runtime-ts): read Cloudflare D1's affected-row count

extractRowCount handled libsql `rowsAffected`, node-postgres `rowCount`,
bun:sqlite `changes` and mysql2's header, but not drizzle-orm/d1's
`{ success, meta: { changes }, results }`. Every D1 delete therefore
counted 0 rows, and the generated Fastify and Hono DELETE routes answered
404 after deleting the row. Found on an adopter's Workers admin panel; it
predates 1.0.

The shared helper now reads meta.changes, and the drizzle ObjectManager
driver, which had a second copy of the same function missing the same
shape (and bun:sqlite's), now imports the shared one.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01M1mRRB1K2WdYy82kntMQdx

Author: dmealing

CHANGELOG.md

@@ -45,6 +45,13 @@ here.**
 
 ### Fixed
 
+- **Generated DELETE routes on Cloudflare D1 answer 204, not 404.** The affected-row count
+  read libsql, Postgres, bun:sqlite and mysql2 result shapes, but not D1's
+  `{ meta: { changes } }`, so every D1 delete counted 0 rows and the route answered 404 after
+  deleting the row (an admin panel showed an error and kept the row on screen). The drizzle
+  ObjectManager driver had its own copy of the same count and now shares the fixed one.
+  **Upgrading:** a project with an ejected adapter copy under `codegen/runtime/` takes it with
+  `meta eject routes-hono --force` (or merges the one-line change by hand).
 - **The missing-FK-index advisory suggests a name unique to the table.** It suggested
   `by<Field>`, so two entities with the same FK field (`Citation.auditEntryId`,
   `Approval.auditEntryId`) were both told `byAuditEntryId`. Postgres index names are schema-wide,

examples/advanced-modeling/codegen/runtime/drizzle-fastify/util.ts

@@ -117,8 +117,9 @@ export async function firstRow(db: unknown, src: unknown, cond: unknown): Promis
 
 /**
  * Rows a DELETE/UPDATE affected, across the driver result shapes: libsql `rowsAffected`,
- * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, and mysql2's
- * `[ResultSetHeader, fields]` tuple.
+ * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, Cloudflare D1's
+ * `{ meta: { changes } }`, and mysql2's `[ResultSetHeader, fields]` tuple. The one place
+ * this is decided — the routes and the drizzle driver both call it.
  */
 export function extractRowCount(result: unknown): number {
   if (typeof result === "number") return result;
@@ -134,6 +135,11 @@ export function extractRowCount(result: unknown): number {
     if (typeof obj.rowCount === "number") return obj.rowCount;
     // bun:sqlite / better-sqlite3 run() result shape.
     if (typeof obj.changes === "number") return obj.changes;
+    // Cloudflare D1 (drizzle-orm/d1): `{ success, meta: { changes, … }, results }`. Missing
+    // it read every D1 delete as 0 rows, and the generated DELETE answered 404 after
+    // deleting the row.
+    const meta = (result as { meta?: { changes?: unknown } }).meta;
+    if (meta !== undefined && typeof meta.changes === "number") return meta.changes;
   }
   return 0;
 }

examples/showcase/codegen/runtime/drizzle-fastify/util.ts

@@ -117,8 +117,9 @@ export async function firstRow(db: unknown, src: unknown, cond: unknown): Promis
 
 /**
  * Rows a DELETE/UPDATE affected, across the driver result shapes: libsql `rowsAffected`,
- * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, and mysql2's
- * `[ResultSetHeader, fields]` tuple.
+ * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, Cloudflare D1's
+ * `{ meta: { changes } }`, and mysql2's `[ResultSetHeader, fields]` tuple. The one place
+ * this is decided — the routes and the drizzle driver both call it.
  */
 export function extractRowCount(result: unknown): number {
   if (typeof result === "number") return result;
@@ -134,6 +135,11 @@ export function extractRowCount(result: unknown): number {
     if (typeof obj.rowCount === "number") return obj.rowCount;
     // bun:sqlite / better-sqlite3 run() result shape.
     if (typeof obj.changes === "number") return obj.changes;
+    // Cloudflare D1 (drizzle-orm/d1): `{ success, meta: { changes, … }, results }`. Missing
+    // it read every D1 delete as 0 rows, and the generated DELETE answered 404 after
+    // deleting the row.
+    const meta = (result as { meta?: { changes?: unknown } }).meta;
+    if (meta !== undefined && typeof meta.changes === "number") return meta.changes;
   }
   return 0;
 }

server/typescript/packages/runtime-ts/src/drivers/drizzle-driver.ts

@@ -31,6 +31,7 @@ import {
   getTableColumns,
   type SQL,
 } from "drizzle-orm";
+import { extractRowCount } from "../drizzle-fastify/util.js";
 import type {
   PersistenceDriver,
   SelectSpec,
@@ -408,23 +409,6 @@ function jsKeyedFromSelect(row: Row, _selectMap: Record<string, AnyColumn>): Row
   return row;
 }
 
-function extractRowCount(result: unknown): number {
-  // Drizzle's update/delete return shape varies by backend. We support the
-  // common shapes; unknown shapes fall through to 0.
-  if (typeof result === "number") return result;
-  // mysql2: `[ResultSetHeader, fields]`, the count on the header.
-  if (Array.isArray(result) && typeof (result[0] as { affectedRows?: unknown } | undefined)?.affectedRows === "number") {
-    return (result[0] as { affectedRows: number }).affectedRows;
-  }
-  if (Array.isArray(result)) return result.length;
-  if (result && typeof result === "object") {
-    const obj = result as { rowsAffected?: number | bigint; rowCount?: number };
-    if (typeof obj.rowsAffected === "number") return obj.rowsAffected;
-    if (typeof obj.rowsAffected === "bigint") return Number(obj.rowsAffected);
-    if (typeof obj.rowCount === "number") return obj.rowCount;
-  }
-  return 0;
-}
 
 function buildExpression(w: WhereClause, cols: Map<string, AnyColumn>): unknown {
   switch (w.kind) {

server/typescript/packages/runtime-ts/src/drizzle-fastify/util.ts

@@ -117,8 +117,9 @@ export async function firstRow(db: unknown, src: unknown, cond: unknown): Promis
 
 /**
  * Rows a DELETE/UPDATE affected, across the driver result shapes: libsql `rowsAffected`,
- * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, and mysql2's
- * `[ResultSetHeader, fields]` tuple.
+ * node-postgres `rowCount`, bun:sqlite / better-sqlite3 `changes`, Cloudflare D1's
+ * `{ meta: { changes } }`, and mysql2's `[ResultSetHeader, fields]` tuple. The one place
+ * this is decided — the routes and the drizzle driver both call it.
  */
 export function extractRowCount(result: unknown): number {
   if (typeof result === "number") return result;
@@ -134,6 +135,11 @@ export function extractRowCount(result: unknown): number {
     if (typeof obj.rowCount === "number") return obj.rowCount;
     // bun:sqlite / better-sqlite3 run() result shape.
     if (typeof obj.changes === "number") return obj.changes;
+    // Cloudflare D1 (drizzle-orm/d1): `{ success, meta: { changes, … }, results }`. Missing
+    // it read every D1 delete as 0 rows, and the generated DELETE answered 404 after
+    // deleting the row.
+    const meta = (result as { meta?: { changes?: unknown } }).meta;
+    if (meta !== undefined && typeof meta.changes === "number") return meta.changes;
   }
   return 0;
 }

server/typescript/packages/runtime-ts/test/extract-row-count.test.ts

@@ -0,0 +1,21 @@
+// Rows a DELETE/UPDATE affected, per driver result shape. Cloudflare D1 (drizzle-orm/d1)
+// resolves a run() to `{ success, meta: { changes, … }, results }` — no `rowsAffected`,
+// `rowCount` or top-level `changes` — so the count fell through to 0 and every generated
+// DELETE answered 404 after deleting the row (found on an adopter's Workers admin panel).
+import { describe, test, expect } from "bun:test";
+import { extractRowCount } from "../src/drizzle-fastify/util.js";
+
+describe("extractRowCount", () => {
+  test("Cloudflare D1: meta.changes", () => {
+    expect(extractRowCount({ success: true, meta: { changes: 1, last_row_id: 3, duration: 0.2 }, results: [] })).toBe(1);
+    expect(extractRowCount({ success: true, meta: { changes: 0 }, results: [] })).toBe(0);
+  });
+  test("the existing shapes still read", () => {
+    expect(extractRowCount({ rowsAffected: 2 })).toBe(2);
+    expect(extractRowCount({ rowsAffected: 2n })).toBe(2);
+    expect(extractRowCount({ rowCount: 3 })).toBe(3);
+    expect(extractRowCount({ changes: 4 })).toBe(4);
+    expect(extractRowCount([{ affectedRows: 5 }, []])).toBe(5);
+    expect(extractRowCount(6)).toBe(6);
+  });
+});