Skip to content

Commit 79014e6

Browse files
fix(server): migrate-dev-db no longer trips over webhook tables (pingdotgg#24404)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent d53873b commit 79014e6

2 files changed

Lines changed: 31 additions & 3 deletions

File tree

‎apps/server/scripts/migrate-dev-db.test.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ const createFixtureSource = Effect.fn("createMigrateDevDbFixtureSource")(functio
8787
created_at, updated_at, last_run_status, run_count)
8888
VALUES ('task-1', 'Nightly', 'Run it', 1, '{}', 'project-kept', '{}', '{}',
8989
'full-access', 'default', 'user', 'user', '2026-08-01', '2026-08-01', 'never', 0)`;
90+
yield* sql`INSERT INTO scheduled_task_webhook_replay_keys
91+
(task_id, replay_key, delivery_id, expires_at)
92+
VALUES ('task-1', 'replay-1', 'delivery-1', 1900000000000)`;
93+
yield* sql`INSERT INTO scheduled_task_webhook_pending
94+
(delivery_id, task_id, coalesce_key, due_at, task_json, request_json, delivery_ids_json)
95+
VALUES ('delivery-1', 'task-1', 'key-1', 1900000000000, '{}', '{}', '[]')`;
9096
yield* sql`INSERT INTO auth_sessions (session_id, subject, scopes, method, issued_at, expires_at)
9197
VALUES ('session-1', 'user', '[]', 'pairing', '2026-08-01', '2027-08-01')`;
9298
}),
@@ -119,10 +125,17 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
119125
SELECT stream_id FROM orchestration_events ORDER BY stream_id`;
120126
const sessions = yield* sql<{ provider_session_id: string }>`
121127
SELECT provider_session_id FROM orchestration_v2_projection_provider_sessions`;
122-
const [leftovers] = yield* sql<{ auth: number; tasks: number; transfers: number }>`
128+
const [leftovers] = yield* sql<{
129+
auth: number;
130+
tasks: number;
131+
webhooks: number;
132+
transfers: number;
133+
}>`
123134
SELECT
124135
(SELECT COUNT(*) FROM auth_sessions) AS auth,
125136
(SELECT COUNT(*) FROM scheduled_tasks) AS tasks,
137+
(SELECT COUNT(*) FROM scheduled_task_webhook_replay_keys) +
138+
(SELECT COUNT(*) FROM scheduled_task_webhook_pending) AS webhooks,
126139
(SELECT COUNT(*) FROM orchestration_v2_projection_context_transfers) AS transfers`;
127140
return { threads, events, sessions, leftovers };
128141
}),
@@ -139,7 +152,7 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
139152
kept.sessions.map((row) => row.provider_session_id),
140153
["session-shared"],
141154
);
142-
assert.deepStrictEqual(kept.leftovers, { auth: 0, tasks: 0, transfers: 0 });
155+
assert.deepStrictEqual(kept.leftovers, { auth: 0, tasks: 0, webhooks: 0, transfers: 0 });
143156
}),
144157
);
145158

‎apps/server/scripts/migrate-dev-db.ts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,21 @@ const copySourceSlice = Effect.fn("copyDevDbSourceSlice")(function* (sourcePath:
250250
);
251251
const tables = schema.filter((entry) => entry.type === "table" && !isShadowTable(entry.name));
252252
const filtered = tables.some((table) => table.name === "orchestration_v2_projection_threads");
253+
// A row that points into a cleared table cannot be copied, so whatever references one is
254+
// cleared with it, however far down the chain a newer migration added it.
255+
const references = yield* sql<{ name: string; parent: string }>`
256+
SELECT m.name, f."table" AS parent FROM src.sqlite_master m, pragma_foreign_key_list(m.name, 'src') f
257+
WHERE m.type = 'table'`;
258+
const cleared = new Set(CLEARED_TABLES);
259+
for (let grew = true; grew;) {
260+
grew = false;
261+
for (const { name, parent } of references) {
262+
if (cleared.has(parent) && !cleared.has(name)) {
263+
cleared.add(name);
264+
grew = true;
265+
}
266+
}
267+
}
253268

254269
yield* sql.withTransaction(
255270
Effect.gen(function* () {
@@ -263,7 +278,7 @@ const copySourceSlice = Effect.fn("copyDevDbSourceSlice")(function* (sourcePath:
263278
WHERE ${rootIsVisible(sql)}`;
264279
}
265280
for (const { name } of tables) {
266-
if (CLEARED_TABLES.includes(name) || virtualTables.includes(name)) continue;
281+
if (cleared.has(name) || virtualTables.includes(name)) continue;
267282
const nullable = threadIdNullable.get(name);
268283
const filter = !filtered
269284
? ""

0 commit comments

Comments
 (0)