root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stop schema comments truncating parsed table bodies

Browse Source 
parseCreateTableSchemasFromSql now strips `--` comments before the
non-greedy CREATE TABLE body regex, so a `);` inside a schema comment can
no longer end a table body early and silently drop columns from
ensureSchemaCompatibility()'s backfill set. Fixes legacy DBs missing
newer task columns (checkout-lease, column dwell) after upgrade.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
gsxdsm
2026-06-26 17:33:06 -07:00
parent ad3149093a
commit 525953b494
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.changeset/fix-schema-compat-comment-truncation.md Normal file
View File

@@ -0,0 +1,7 @@
---
"@runfusion/fusion": patch
---
summary: Fix legacy databases missing newer task columns (e.g. checkout-lease, column dwell) after upgrade.
category: fix
dev: parseCreateTableSchemasFromSql now strips `--` comments before the non-greedy CREATE TABLE body regex, so a `);` inside a schema comment can no longer truncate a parsed table body and silently drop columns from ensureSchemaCompatibility()'s backfill set.

15
packages/core/src/db.ts
View File

@@ -1375,7 +1375,20 @@ function parseCreateTableSchemasFromSql(sql: string): Map<string, Map<string, st
const schema = new Map<string, Map<string, string>>(); const schema = new Map<string, Map<string, string>>();
const createTableRegex = /CREATE TABLE\s+(?:IF NOT EXISTS\s+)?((?:["`]|\[)?[A-Za-z_][A-Za-z0-9_]*(?:["`]|\])?)\s*\(([\s\S]*?)\)\s*;/g; const createTableRegex = /CREATE TABLE\s+(?:IF NOT EXISTS\s+)?((?:["`]|\[)?[A-Za-z_][A-Za-z0-9_]*(?:["`]|\])?)\s*\(([\s\S]*?)\)\s*;/g;
for (const match of sql.matchAll(createTableRegex)) { /*
FNXC:SchemaCompatBackfill 2026-06-26-17:30:
Strip `--` line comments from the whole schema BEFORE matching each table-definition block.
The body-capture regex is non-greedy (`([\s\S]*?)\)\s*;`), so a `)` immediately followed by `;`
inside a comment (e.g. a doc reference like `getSchemaCompatibilityTableSchemas();` or
`task.workflowStepResults);`) truncates the matched table body early. That silently dropped every
column after the comment from the parsed schema, so ensureSchemaCompatibility() stopped backfilling
them on legacy DBs whose schemaVersion was already current (regression surfaced as a missing
`checkoutNodeId`/`columnDwellMs` column on the tasks table). Stripping comments up front keeps the
per-line strip below as defense-in-depth while preventing comment content from ending a table body.
*/
const sqlWithoutComments = sql.replace(/--[^\n]*/g, "");
for (const match of sqlWithoutComments.matchAll(createTableRegex)) {
const tableName = normalizeSqlIdentifier(match[1]); const tableName = normalizeSqlIdentifier(match[1]);
const body = match[2] ?? ""; const body = match[2] ?? "";
const columns = new Map<string, string>(); const columns = new Map<string, string>();