drizzle-orm 1.0.0-beta.22-41a7d21 → 1.0.0-beta.22-bf0fa46

package/up-migrations/singlestore.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"singlestore.cjs","names":["sql"],"sources":["../../src/up-migrations/singlestore.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport type { SingleStoreSession } from '~/singlestore-core/session.ts';\nimport { type SQL, sql } from '~/sql/sql.ts';\n\nconst CURRENT_MIGRATION_TABLE_VERSION = 1;\n\ninterface UpgradeResult {\n\tnewDb?: boolean;\n\tprevVersion?: number;\n\tcurrentVersion?: number;\n}\n\nfunction getVersion(columns: string[]) {\n\tif (columns.includes('name')) return 1;\n\treturn 0;\n}\n\n// singlestore returns array of objects for .all, but singlestore-proxy -> array of arrays\nasync function all<T>(\n\tsession: SingleStoreSession,\n\tsqlQuery: SQL,\n\tresultMapper: (row: any[]) => T = () => [] as T,\n): Promise<T[]> {\n\tconst result = await session.all(sqlQuery) as any[] | any[][];\n\n\tif (result.length === 0) return [];\n\n\tif (Array.isArray(result[0])) {\n\t\treturn (result as any[][]).map((row) => resultMapper(row));\n\t}\n\n\treturn result as T[];\n}\n\n/**\n * Map of upgrade functions. Each key is the version being upgraded FROM,\n * and the function upgrades the table to the next version.\n */\nconst upgradeFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tsession: SingleStoreSession,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, session, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\tconst dbRows = await all<{ id: number; hash: string; created_at: string }>(\n\t\t\tsession,\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t\t(row) => ({\n\t\t\t\tid: row[0],\n\t\t\t\thash: row[1],\n\t\t\t\tcreated_at: row[2],\n\t\t\t}),\n\t\t);\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\t\tconst toApply: { id: number; name: string }[] = [];\n\t\tlet unmatchedIds: number[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash === dbRow.hash);\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t}\n\n\t\t\tif (matched) toApply.push({ id: dbRow.id, name: matched.name });\n\t\t\telse unmatchedIds.push(dbRow.id);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatchedIds.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatchedIds.length} migrations (ids: ${\n\t\t\t\t\tunmatchedIds.join(', ')\n\t\t\t\t}) in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tawait session.execute(sql`ALTER TABLE ${table} ADD ${sql.identifier('name')} text`);\n\t\tawait session.execute(\n\t\t\tsql`ALTER TABLE ${table} ADD ${sql.identifier('applied_at')} TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,\n\t\t);\n\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tawait session.execute(\n\t\t\t\tsql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\t\tsql.identifier('applied_at')\n\t\t\t\t} = NULL WHERE ${sql.identifier('id')} = ${backfillEntry.id}`,\n\t\t\t);\n\t\t}\n\t},\n};\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeIfNeeded(\n\tmigrationsTable: string,\n\tsession: SingleStoreSession,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst result = await all<{ '1': 1 }>(\n\t\tsession,\n\t\tsql`SELECT 1 FROM information_schema.tables \n\t\t\tWHERE table_name = ${migrationsTable}\n\t\t\tAND table_schema = DATABASE()`,\n\t\t(row) => ({ '1': row[0] }),\n\t);\n\n\tif (result.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await all<{ column_name: string }>(\n\t\tsession,\n\t\tsql`SELECT column_name as \\`column_name\\`\n\t\tFROM information_schema.columns\n\t\tWHERE table_name = ${migrationsTable}\n\t\tAND table_schema = DATABASE()\n\t\tORDER BY ordinal_position`,\n\t\t(row) => ({ column_name: row[0] }),\n\t);\n\n\tconst version = getVersion(rows.map((r) => r.column_name));\n\n\tfor (let v = version; v < CURRENT_MIGRATION_TABLE_VERSION; v++) {\n\t\tconst upgradeFn = upgradeFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, session, localMigrations);\n\t}\n\n\treturn { prevVersion: version, currentVersion: CURRENT_MIGRATION_TABLE_VERSION };\n}\n"],"mappings":";;;;;AAIA,MAAM,kCAAkC;AAQxC,SAAS,WAAW,SAAmB;AACtC,KAAI,QAAQ,SAAS,OAAO,CAAE,QAAO;AACrC,QAAO;;AAIR,eAAe,IACd,SACA,UACA,qBAAwC,EAAE,EAC3B;CACf,MAAM,SAAS,MAAM,QAAQ,IAAI,SAAS;AAE1C,KAAI,OAAO,WAAW,EAAG,QAAO,EAAE;AAElC,KAAI,MAAM,QAAQ,OAAO,GAAG,CAC3B,QAAQ,OAAmB,KAAK,QAAQ,aAAa,IAAI,CAAC;AAG3D,QAAO;;;;;;AAOR,MAAM,mBAOF,EAUH,GAAG,OAAO,iBAAiB,SAAS,oBAAoB;CACvD,MAAM,QAAQ,gBAAG,GAAGA,iBAAI,WAAW,gBAAgB;CAInD,MAAM,SAAS,MAAM,IACpB,SACA,gBAAG,oCAAoC,MAAM,oBAC5C,SAAS;EACT,IAAI,IAAI;EACR,MAAM,IAAI;EACV,YAAY,IAAI;EAChB,EACD;AAGD,iBAAgB,MAAM,GAAG,MACxB,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,GAAG,CAChH;CAED,MAAM,2BAAW,IAAI,KAA8B;CACnD,MAAM,yBAAS,IAAI,KAA4B;AAC/C,MAAK,MAAM,MAAM,iBAAiB;AACjC,MAAI,CAAC,SAAS,IAAI,GAAG,aAAa,CACjC,UAAS,IAAI,GAAG,cAAc,EAAE,CAAC;AAElC,WAAS,IAAI,GAAG,aAAa,CAAE,KAAK,GAAG;AACvC,SAAO,IAAI,GAAG,MAAM,GAAG;;CAKxB,MAAM,UAA0C,EAAE;CAClD,IAAI,eAAyB,EAAE;AAE/B,MAAK,MAAM,SAAS,QAAQ;EAC3B,MAAM,cAAc,OAAO,MAAM,WAAW;EAC5C,MAAM,SAAS,OAAO,YAAY,UAAU,GAAG,YAAY,SAAS,EAAE,GAAG,MAAM;EAC/E,MAAM,aAAa,SAAS,IAAI,OAAO;EAEvC,IAAI;AAEJ,MAAI,cAAc,WAAW,WAAW,EACvC,WAAU,WAAW;WACX,cAAc,WAAW,SAAS,EAC5C,WAAU,WAAW,MAAM,MAAM,EAAE,SAAS,MAAM,KAAK;MAEvD,WAAU,OAAO,IAAI,MAAM,KAAK;AAGjC,MAAI,QAAS,SAAQ,KAAK;GAAE,IAAI,MAAM;GAAI,MAAM,QAAQ;GAAM,CAAC;MAC1D,cAAa,KAAK,MAAM,GAAG;;AAQjC,KAAI,aAAa,SAAS,EACzB,OAAM,MACL,2DAA2D,aAAa,OAAO,oBAC9E,aAAa,KAAK,KAAK,CACvB,kKACD;AAIF,OAAM,QAAQ,QAAQ,gBAAG,eAAe,MAAM,OAAOA,iBAAI,WAAW,OAAO,CAAC,OAAO;AACnF,OAAM,QAAQ,QACb,gBAAG,eAAe,MAAM,OAAOA,iBAAI,WAAW,aAAa,CAAC,sCAC5D;AAED,MAAK,MAAM,iBAAiB,QAC3B,OAAM,QAAQ,QACb,gBAAG,UAAU,MAAM,OAAOA,iBAAI,WAAW,OAAO,CAAC,KAAK,cAAc,KAAK,IACxEA,iBAAI,WAAW,aAAa,CAC5B,gBAAgBA,iBAAI,WAAW,KAAK,CAAC,KAAK,cAAc,KACzD;GAGH;;;;;;;AAQD,eAAsB,gBACrB,iBACA,SACA,iBACyB;AAUzB,MARe,MAAM,IACpB,SACA,gBAAG;wBACmB,gBAAgB;oCAErC,SAAS,EAAE,KAAK,IAAI,IAAI,EACzB,EAEU,WAAW,EACrB,QAAO,EAAE,OAAO,MAAM;CAcvB,MAAM,UAAU,YAVH,MAAM,IAClB,SACA,gBAAG;;uBAEkB,gBAAgB;;+BAGpC,SAAS,EAAE,aAAa,IAAI,IAAI,EACjC,EAE+B,KAAK,MAAM,EAAE,YAAY,CAAC;AAE1D,MAAK,IAAI,IAAI,SAAS,IAAI,iCAAiC,KAAK;EAC/D,MAAM,YAAY,iBAAiB;AACnC,MAAI,CAAC,UACJ,OAAM,IAAI,MAAM,gDAAgD,EAAE,MAAM,IAAI,IAAI;AAEjF,QAAM,UAAU,iBAAiB,SAAS,gBAAgB;;AAG3D,QAAO;EAAE,aAAa;EAAS,gBAAgB;EAAiC"}
+{"version":3,"file":"singlestore.cjs","names":["sql","GET_VERSION_FOR","MIGRATIONS_TABLE_VERSIONS"],"sources":["../../src/up-migrations/singlestore.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport type { SingleStoreSession } from '~/singlestore-core/session.ts';\nimport { sql } from '~/sql/sql.ts';\nimport { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS, type UpgradeResult } from './utils.ts';\n\n/**\n * Map of upgrade functions. Each key is the version being upgraded FROM,\n * and the function upgrades the table to the next version.\n */\nconst upgradeFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tsession: SingleStoreSession,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, session, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\tconst dbRows = await session.all<{ id: number; hash: string; created_at: string }>(\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t);\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\t\tconst toApply: { id: number; name: string }[] = [];\n\t\tlet unmatchedIds: number[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash === dbRow.hash);\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t}\n\n\t\t\tif (matched) toApply.push({ id: dbRow.id, name: matched.name });\n\t\t\telse unmatchedIds.push(dbRow.id);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatchedIds.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatchedIds.length} migrations (ids: ${\n\t\t\t\t\tunmatchedIds.join(', ')\n\t\t\t\t}) in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tawait session.execute(sql`ALTER TABLE ${table} ADD ${sql.identifier('name')} text`);\n\t\tawait session.execute(\n\t\t\tsql`ALTER TABLE ${table} ADD ${sql.identifier('applied_at')} TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,\n\t\t);\n\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tawait session.execute(\n\t\t\t\tsql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\t\tsql.identifier('applied_at')\n\t\t\t\t} = NULL WHERE ${sql.identifier('id')} = ${backfillEntry.id}`,\n\t\t\t);\n\t\t}\n\t},\n};\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeIfNeeded(\n\tmigrationsTable: string,\n\tsession: SingleStoreSession,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst result = await session.all<{ '1': 1 }>(\n\t\tsql`SELECT 1 FROM information_schema.tables \n\t\t\tWHERE table_name = ${migrationsTable}\n\t\t\tAND table_schema = DATABASE()`,\n\t);\n\n\tif (result.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await session.all<{ column_name: string }>(\n\t\tsql`SELECT column_name as \\`column_name\\`\n\t\tFROM information_schema.columns\n\t\tWHERE table_name = ${migrationsTable}\n\t\tAND table_schema = DATABASE()\n\t\tORDER BY ordinal_position`,\n\t);\n\n\tconst version = GET_VERSION_FOR.singlestore(rows.map((r) => r.column_name));\n\n\tfor (let v = version; v < MIGRATIONS_TABLE_VERSIONS.singlestore; v++) {\n\t\tconst upgradeFn = upgradeFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, session, localMigrations);\n\t}\n\n\treturn { newDb: false };\n}\n"],"mappings":";;;;;;;;;;AASA,MAAM,mBAOF,EAUH,GAAG,OAAO,iBAAiB,SAAS,oBAAoB;CACvD,MAAM,QAAQ,gBAAG,GAAGA,iBAAI,WAAW,gBAAgB;CAInD,MAAM,SAAS,MAAM,QAAQ,IAC5B,gBAAG,oCAAoC,MAAM,kBAC7C;AAGD,iBAAgB,MAAM,GAAG,MACxB,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,GAAG,CAChH;CAED,MAAM,2BAAW,IAAI,KAA8B;CACnD,MAAM,yBAAS,IAAI,KAA4B;AAC/C,MAAK,MAAM,MAAM,iBAAiB;AACjC,MAAI,CAAC,SAAS,IAAI,GAAG,aAAa,CACjC,UAAS,IAAI,GAAG,cAAc,EAAE,CAAC;AAElC,WAAS,IAAI,GAAG,aAAa,CAAE,KAAK,GAAG;AACvC,SAAO,IAAI,GAAG,MAAM,GAAG;;CAKxB,MAAM,UAA0C,EAAE;CAClD,IAAI,eAAyB,EAAE;AAE/B,MAAK,MAAM,SAAS,QAAQ;EAC3B,MAAM,cAAc,OAAO,MAAM,WAAW;EAC5C,MAAM,SAAS,OAAO,YAAY,UAAU,GAAG,YAAY,SAAS,EAAE,GAAG,MAAM;EAC/E,MAAM,aAAa,SAAS,IAAI,OAAO;EAEvC,IAAI;AAEJ,MAAI,cAAc,WAAW,WAAW,EACvC,WAAU,WAAW;WACX,cAAc,WAAW,SAAS,EAC5C,WAAU,WAAW,MAAM,MAAM,EAAE,SAAS,MAAM,KAAK;MAEvD,WAAU,OAAO,IAAI,MAAM,KAAK;AAGjC,MAAI,QAAS,SAAQ,KAAK;GAAE,IAAI,MAAM;GAAI,MAAM,QAAQ;GAAM,CAAC;MAC1D,cAAa,KAAK,MAAM,GAAG;;AAQjC,KAAI,aAAa,SAAS,EACzB,OAAM,MACL,2DAA2D,aAAa,OAAO,oBAC9E,aAAa,KAAK,KAAK,CACvB,kKACD;AAIF,OAAM,QAAQ,QAAQ,gBAAG,eAAe,MAAM,OAAOA,iBAAI,WAAW,OAAO,CAAC,OAAO;AACnF,OAAM,QAAQ,QACb,gBAAG,eAAe,MAAM,OAAOA,iBAAI,WAAW,aAAa,CAAC,sCAC5D;AAED,MAAK,MAAM,iBAAiB,QAC3B,OAAM,QAAQ,QACb,gBAAG,UAAU,MAAM,OAAOA,iBAAI,WAAW,OAAO,CAAC,KAAK,cAAc,KAAK,IACxEA,iBAAI,WAAW,aAAa,CAC5B,gBAAgBA,iBAAI,WAAW,KAAK,CAAC,KAAK,cAAc,KACzD;GAGH;;;;;;;AAQD,eAAsB,gBACrB,iBACA,SACA,iBACyB;AAQzB,MANe,MAAM,QAAQ,IAC5B,gBAAG;wBACmB,gBAAgB;kCAEtC,EAEU,WAAW,EACrB,QAAO,EAAE,OAAO,MAAM;CAIvB,MAAM,OAAO,MAAM,QAAQ,IAC1B,gBAAG;;uBAEkB,gBAAgB;;6BAGrC;CAED,MAAM,UAAUC,4CAAgB,YAAY,KAAK,KAAK,MAAM,EAAE,YAAY,CAAC;AAE3E,MAAK,IAAI,IAAI,SAAS,IAAIC,sDAA0B,aAAa,KAAK;EACrE,MAAM,YAAY,iBAAiB;AACnC,MAAI,CAAC,UACJ,OAAM,IAAI,MAAM,gDAAgD,EAAE,MAAM,IAAI,IAAI;AAEjF,QAAM,UAAU,iBAAiB,SAAS,gBAAgB;;AAG3D,QAAO,EAAE,OAAO,OAAO"}

package/up-migrations/singlestore.d.cts

@@ -1,12 +1,8 @@
+import { UpgradeResult } from "./utils.cjs";
 import { MigrationMeta } from "../migrator.cjs";
 import { SingleStoreSession } from "../singlestore-core/session.cjs";
 
 //#region src/up-migrations/singlestore.d.ts
-interface UpgradeResult {
-  newDb?: boolean;
-  prevVersion?: number;
-  currentVersion?: number;
-}
 /**
  * Detects the current version of the migrations table schema and upgrades it if needed.
  *

package/up-migrations/singlestore.d.ts

@@ -1,12 +1,8 @@
+import { UpgradeResult } from "./utils.js";
 import { MigrationMeta } from "../migrator.js";
 import { SingleStoreSession } from "../singlestore-core/session.js";
 
 //#region src/up-migrations/singlestore.d.ts
-interface UpgradeResult {
-  newDb?: boolean;
-  prevVersion?: number;
-  currentVersion?: number;
-}
 /**
  * Detects the current version of the migrations table schema and upgrades it if needed.
  *

package/up-migrations/singlestore.js

@@ -1,28 +1,14 @@
+import { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS } from "./utils.js";
 import { sql } from "../sql/sql.js";
 
 //#region src/up-migrations/singlestore.ts
-const CURRENT_MIGRATION_TABLE_VERSION = 1;
-function getVersion(columns) {
-	if (columns.includes("name")) return 1;
-	return 0;
-}
-async function all(session, sqlQuery, resultMapper = () => []) {
-	const result = await session.all(sqlQuery);
-	if (result.length === 0) return [];
-	if (Array.isArray(result[0])) return result.map((row) => resultMapper(row));
-	return result;
-}
 /**
 * Map of upgrade functions. Each key is the version being upgraded FROM,
 * and the function upgrades the table to the next version.
 */
 const upgradeFunctions = { 0: async (migrationsTable, session, localMigrations) => {
 	const table = sql`${sql.identifier(migrationsTable)}`;
-	const dbRows = await all(session, sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`, (row) => ({
-		id: row[0],
-		hash: row[1],
-		created_at: row[2]
-	}));
+	const dbRows = await session.all(sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`);
 	localMigrations.sort((a, b) => a.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? "").localeCompare(b.name ?? ""));
 	const byMillis = /* @__PURE__ */ new Map();
 	const byHash = /* @__PURE__ */ new Map();
@@ -59,23 +45,21 @@ const upgradeFunctions = { 0: async (migrationsTable, session, localMigrations)
 * Version 1: Extended schema (id, hash, created_at, name, applied_at)
 */
 async function upgradeIfNeeded(migrationsTable, session, localMigrations) {
-	if ((await all(session, sql`SELECT 1 FROM information_schema.tables 
+	if ((await session.all(sql`SELECT 1 FROM information_schema.tables 
 			WHERE table_name = ${migrationsTable}
-			AND table_schema = DATABASE()`, (row) => ({ "1": row[0] }))).length === 0) return { newDb: true };
-	const version = getVersion((await all(session, sql`SELECT column_name as \`column_name\`
+			AND table_schema = DATABASE()`)).length === 0) return { newDb: true };
+	const rows = await session.all(sql`SELECT column_name as \`column_name\`
 		FROM information_schema.columns
 		WHERE table_name = ${migrationsTable}
 		AND table_schema = DATABASE()
-		ORDER BY ordinal_position`, (row) => ({ column_name: row[0] }))).map((r) => r.column_name));
-	for (let v = version; v < CURRENT_MIGRATION_TABLE_VERSION; v++) {
+		ORDER BY ordinal_position`);
+	const version = GET_VERSION_FOR.singlestore(rows.map((r) => r.column_name));
+	for (let v = version; v < MIGRATIONS_TABLE_VERSIONS.singlestore; v++) {
 		const upgradeFn = upgradeFunctions[v];
 		if (!upgradeFn) throw new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);
 		await upgradeFn(migrationsTable, session, localMigrations);
 	}
-	return {
-		prevVersion: version,
-		currentVersion: CURRENT_MIGRATION_TABLE_VERSION
-	};
+	return { newDb: false };
 }
 
 //#endregion

package/up-migrations/singlestore.js.map

@@ -1 +1 @@
-{"version":3,"file":"singlestore.js","names":[],"sources":["../../src/up-migrations/singlestore.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport type { SingleStoreSession } from '~/singlestore-core/session.ts';\nimport { type SQL, sql } from '~/sql/sql.ts';\n\nconst CURRENT_MIGRATION_TABLE_VERSION = 1;\n\ninterface UpgradeResult {\n\tnewDb?: boolean;\n\tprevVersion?: number;\n\tcurrentVersion?: number;\n}\n\nfunction getVersion(columns: string[]) {\n\tif (columns.includes('name')) return 1;\n\treturn 0;\n}\n\n// singlestore returns array of objects for .all, but singlestore-proxy -> array of arrays\nasync function all<T>(\n\tsession: SingleStoreSession,\n\tsqlQuery: SQL,\n\tresultMapper: (row: any[]) => T = () => [] as T,\n): Promise<T[]> {\n\tconst result = await session.all(sqlQuery) as any[] | any[][];\n\n\tif (result.length === 0) return [];\n\n\tif (Array.isArray(result[0])) {\n\t\treturn (result as any[][]).map((row) => resultMapper(row));\n\t}\n\n\treturn result as T[];\n}\n\n/**\n * Map of upgrade functions. Each key is the version being upgraded FROM,\n * and the function upgrades the table to the next version.\n */\nconst upgradeFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tsession: SingleStoreSession,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, session, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\tconst dbRows = await all<{ id: number; hash: string; created_at: string }>(\n\t\t\tsession,\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t\t(row) => ({\n\t\t\t\tid: row[0],\n\t\t\t\thash: row[1],\n\t\t\t\tcreated_at: row[2],\n\t\t\t}),\n\t\t);\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\t\tconst toApply: { id: number; name: string }[] = [];\n\t\tlet unmatchedIds: number[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash === dbRow.hash);\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t}\n\n\t\t\tif (matched) toApply.push({ id: dbRow.id, name: matched.name });\n\t\t\telse unmatchedIds.push(dbRow.id);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatchedIds.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatchedIds.length} migrations (ids: ${\n\t\t\t\t\tunmatchedIds.join(', ')\n\t\t\t\t}) in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tawait session.execute(sql`ALTER TABLE ${table} ADD ${sql.identifier('name')} text`);\n\t\tawait session.execute(\n\t\t\tsql`ALTER TABLE ${table} ADD ${sql.identifier('applied_at')} TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,\n\t\t);\n\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tawait session.execute(\n\t\t\t\tsql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\t\tsql.identifier('applied_at')\n\t\t\t\t} = NULL WHERE ${sql.identifier('id')} = ${backfillEntry.id}`,\n\t\t\t);\n\t\t}\n\t},\n};\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeIfNeeded(\n\tmigrationsTable: string,\n\tsession: SingleStoreSession,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst result = await all<{ '1': 1 }>(\n\t\tsession,\n\t\tsql`SELECT 1 FROM information_schema.tables \n\t\t\tWHERE table_name = ${migrationsTable}\n\t\t\tAND table_schema = DATABASE()`,\n\t\t(row) => ({ '1': row[0] }),\n\t);\n\n\tif (result.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await all<{ column_name: string }>(\n\t\tsession,\n\t\tsql`SELECT column_name as \\`column_name\\`\n\t\tFROM information_schema.columns\n\t\tWHERE table_name = ${migrationsTable}\n\t\tAND table_schema = DATABASE()\n\t\tORDER BY ordinal_position`,\n\t\t(row) => ({ column_name: row[0] }),\n\t);\n\n\tconst version = getVersion(rows.map((r) => r.column_name));\n\n\tfor (let v = version; v < CURRENT_MIGRATION_TABLE_VERSION; v++) {\n\t\tconst upgradeFn = upgradeFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, session, localMigrations);\n\t}\n\n\treturn { prevVersion: version, currentVersion: CURRENT_MIGRATION_TABLE_VERSION };\n}\n"],"mappings":";;;AAIA,MAAM,kCAAkC;AAQxC,SAAS,WAAW,SAAmB;AACtC,KAAI,QAAQ,SAAS,OAAO,CAAE,QAAO;AACrC,QAAO;;AAIR,eAAe,IACd,SACA,UACA,qBAAwC,EAAE,EAC3B;CACf,MAAM,SAAS,MAAM,QAAQ,IAAI,SAAS;AAE1C,KAAI,OAAO,WAAW,EAAG,QAAO,EAAE;AAElC,KAAI,MAAM,QAAQ,OAAO,GAAG,CAC3B,QAAQ,OAAmB,KAAK,QAAQ,aAAa,IAAI,CAAC;AAG3D,QAAO;;;;;;AAOR,MAAM,mBAOF,EAUH,GAAG,OAAO,iBAAiB,SAAS,oBAAoB;CACvD,MAAM,QAAQ,GAAG,GAAG,IAAI,WAAW,gBAAgB;CAInD,MAAM,SAAS,MAAM,IACpB,SACA,GAAG,oCAAoC,MAAM,oBAC5C,SAAS;EACT,IAAI,IAAI;EACR,MAAM,IAAI;EACV,YAAY,IAAI;EAChB,EACD;AAGD,iBAAgB,MAAM,GAAG,MACxB,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,GAAG,CAChH;CAED,MAAM,2BAAW,IAAI,KAA8B;CACnD,MAAM,yBAAS,IAAI,KAA4B;AAC/C,MAAK,MAAM,MAAM,iBAAiB;AACjC,MAAI,CAAC,SAAS,IAAI,GAAG,aAAa,CACjC,UAAS,IAAI,GAAG,cAAc,EAAE,CAAC;AAElC,WAAS,IAAI,GAAG,aAAa,CAAE,KAAK,GAAG;AACvC,SAAO,IAAI,GAAG,MAAM,GAAG;;CAKxB,MAAM,UAA0C,EAAE;CAClD,IAAI,eAAyB,EAAE;AAE/B,MAAK,MAAM,SAAS,QAAQ;EAC3B,MAAM,cAAc,OAAO,MAAM,WAAW;EAC5C,MAAM,SAAS,OAAO,YAAY,UAAU,GAAG,YAAY,SAAS,EAAE,GAAG,MAAM;EAC/E,MAAM,aAAa,SAAS,IAAI,OAAO;EAEvC,IAAI;AAEJ,MAAI,cAAc,WAAW,WAAW,EACvC,WAAU,WAAW;WACX,cAAc,WAAW,SAAS,EAC5C,WAAU,WAAW,MAAM,MAAM,EAAE,SAAS,MAAM,KAAK;MAEvD,WAAU,OAAO,IAAI,MAAM,KAAK;AAGjC,MAAI,QAAS,SAAQ,KAAK;GAAE,IAAI,MAAM;GAAI,MAAM,QAAQ;GAAM,CAAC;MAC1D,cAAa,KAAK,MAAM,GAAG;;AAQjC,KAAI,aAAa,SAAS,EACzB,OAAM,MACL,2DAA2D,aAAa,OAAO,oBAC9E,aAAa,KAAK,KAAK,CACvB,kKACD;AAIF,OAAM,QAAQ,QAAQ,GAAG,eAAe,MAAM,OAAO,IAAI,WAAW,OAAO,CAAC,OAAO;AACnF,OAAM,QAAQ,QACb,GAAG,eAAe,MAAM,OAAO,IAAI,WAAW,aAAa,CAAC,sCAC5D;AAED,MAAK,MAAM,iBAAiB,QAC3B,OAAM,QAAQ,QACb,GAAG,UAAU,MAAM,OAAO,IAAI,WAAW,OAAO,CAAC,KAAK,cAAc,KAAK,IACxE,IAAI,WAAW,aAAa,CAC5B,gBAAgB,IAAI,WAAW,KAAK,CAAC,KAAK,cAAc,KACzD;GAGH;;;;;;;AAQD,eAAsB,gBACrB,iBACA,SACA,iBACyB;AAUzB,MARe,MAAM,IACpB,SACA,GAAG;wBACmB,gBAAgB;oCAErC,SAAS,EAAE,KAAK,IAAI,IAAI,EACzB,EAEU,WAAW,EACrB,QAAO,EAAE,OAAO,MAAM;CAcvB,MAAM,UAAU,YAVH,MAAM,IAClB,SACA,GAAG;;uBAEkB,gBAAgB;;+BAGpC,SAAS,EAAE,aAAa,IAAI,IAAI,EACjC,EAE+B,KAAK,MAAM,EAAE,YAAY,CAAC;AAE1D,MAAK,IAAI,IAAI,SAAS,IAAI,iCAAiC,KAAK;EAC/D,MAAM,YAAY,iBAAiB;AACnC,MAAI,CAAC,UACJ,OAAM,IAAI,MAAM,gDAAgD,EAAE,MAAM,IAAI,IAAI;AAEjF,QAAM,UAAU,iBAAiB,SAAS,gBAAgB;;AAG3D,QAAO;EAAE,aAAa;EAAS,gBAAgB;EAAiC"}
+{"version":3,"file":"singlestore.js","names":[],"sources":["../../src/up-migrations/singlestore.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport type { SingleStoreSession } from '~/singlestore-core/session.ts';\nimport { sql } from '~/sql/sql.ts';\nimport { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS, type UpgradeResult } from './utils.ts';\n\n/**\n * Map of upgrade functions. Each key is the version being upgraded FROM,\n * and the function upgrades the table to the next version.\n */\nconst upgradeFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tsession: SingleStoreSession,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, session, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\tconst dbRows = await session.all<{ id: number; hash: string; created_at: string }>(\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t);\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\t\tconst toApply: { id: number; name: string }[] = [];\n\t\tlet unmatchedIds: number[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash === dbRow.hash);\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t}\n\n\t\t\tif (matched) toApply.push({ id: dbRow.id, name: matched.name });\n\t\t\telse unmatchedIds.push(dbRow.id);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatchedIds.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatchedIds.length} migrations (ids: ${\n\t\t\t\t\tunmatchedIds.join(', ')\n\t\t\t\t}) in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tawait session.execute(sql`ALTER TABLE ${table} ADD ${sql.identifier('name')} text`);\n\t\tawait session.execute(\n\t\t\tsql`ALTER TABLE ${table} ADD ${sql.identifier('applied_at')} TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,\n\t\t);\n\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tawait session.execute(\n\t\t\t\tsql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\t\tsql.identifier('applied_at')\n\t\t\t\t} = NULL WHERE ${sql.identifier('id')} = ${backfillEntry.id}`,\n\t\t\t);\n\t\t}\n\t},\n};\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeIfNeeded(\n\tmigrationsTable: string,\n\tsession: SingleStoreSession,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst result = await session.all<{ '1': 1 }>(\n\t\tsql`SELECT 1 FROM information_schema.tables \n\t\t\tWHERE table_name = ${migrationsTable}\n\t\t\tAND table_schema = DATABASE()`,\n\t);\n\n\tif (result.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await session.all<{ column_name: string }>(\n\t\tsql`SELECT column_name as \\`column_name\\`\n\t\tFROM information_schema.columns\n\t\tWHERE table_name = ${migrationsTable}\n\t\tAND table_schema = DATABASE()\n\t\tORDER BY ordinal_position`,\n\t);\n\n\tconst version = GET_VERSION_FOR.singlestore(rows.map((r) => r.column_name));\n\n\tfor (let v = version; v < MIGRATIONS_TABLE_VERSIONS.singlestore; v++) {\n\t\tconst upgradeFn = upgradeFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, session, localMigrations);\n\t}\n\n\treturn { newDb: false };\n}\n"],"mappings":";;;;;;;;AASA,MAAM,mBAOF,EAUH,GAAG,OAAO,iBAAiB,SAAS,oBAAoB;CACvD,MAAM,QAAQ,GAAG,GAAG,IAAI,WAAW,gBAAgB;CAInD,MAAM,SAAS,MAAM,QAAQ,IAC5B,GAAG,oCAAoC,MAAM,kBAC7C;AAGD,iBAAgB,MAAM,GAAG,MACxB,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,GAAG,CAChH;CAED,MAAM,2BAAW,IAAI,KAA8B;CACnD,MAAM,yBAAS,IAAI,KAA4B;AAC/C,MAAK,MAAM,MAAM,iBAAiB;AACjC,MAAI,CAAC,SAAS,IAAI,GAAG,aAAa,CACjC,UAAS,IAAI,GAAG,cAAc,EAAE,CAAC;AAElC,WAAS,IAAI,GAAG,aAAa,CAAE,KAAK,GAAG;AACvC,SAAO,IAAI,GAAG,MAAM,GAAG;;CAKxB,MAAM,UAA0C,EAAE;CAClD,IAAI,eAAyB,EAAE;AAE/B,MAAK,MAAM,SAAS,QAAQ;EAC3B,MAAM,cAAc,OAAO,MAAM,WAAW;EAC5C,MAAM,SAAS,OAAO,YAAY,UAAU,GAAG,YAAY,SAAS,EAAE,GAAG,MAAM;EAC/E,MAAM,aAAa,SAAS,IAAI,OAAO;EAEvC,IAAI;AAEJ,MAAI,cAAc,WAAW,WAAW,EACvC,WAAU,WAAW;WACX,cAAc,WAAW,SAAS,EAC5C,WAAU,WAAW,MAAM,MAAM,EAAE,SAAS,MAAM,KAAK;MAEvD,WAAU,OAAO,IAAI,MAAM,KAAK;AAGjC,MAAI,QAAS,SAAQ,KAAK;GAAE,IAAI,MAAM;GAAI,MAAM,QAAQ;GAAM,CAAC;MAC1D,cAAa,KAAK,MAAM,GAAG;;AAQjC,KAAI,aAAa,SAAS,EACzB,OAAM,MACL,2DAA2D,aAAa,OAAO,oBAC9E,aAAa,KAAK,KAAK,CACvB,kKACD;AAIF,OAAM,QAAQ,QAAQ,GAAG,eAAe,MAAM,OAAO,IAAI,WAAW,OAAO,CAAC,OAAO;AACnF,OAAM,QAAQ,QACb,GAAG,eAAe,MAAM,OAAO,IAAI,WAAW,aAAa,CAAC,sCAC5D;AAED,MAAK,MAAM,iBAAiB,QAC3B,OAAM,QAAQ,QACb,GAAG,UAAU,MAAM,OAAO,IAAI,WAAW,OAAO,CAAC,KAAK,cAAc,KAAK,IACxE,IAAI,WAAW,aAAa,CAC5B,gBAAgB,IAAI,WAAW,KAAK,CAAC,KAAK,cAAc,KACzD;GAGH;;;;;;;AAQD,eAAsB,gBACrB,iBACA,SACA,iBACyB;AAQzB,MANe,MAAM,QAAQ,IAC5B,GAAG;wBACmB,gBAAgB;kCAEtC,EAEU,WAAW,EACrB,QAAO,EAAE,OAAO,MAAM;CAIvB,MAAM,OAAO,MAAM,QAAQ,IAC1B,GAAG;;uBAEkB,gBAAgB;;6BAGrC;CAED,MAAM,UAAU,gBAAgB,YAAY,KAAK,KAAK,MAAM,EAAE,YAAY,CAAC;AAE3E,MAAK,IAAI,IAAI,SAAS,IAAI,0BAA0B,aAAa,KAAK;EACrE,MAAM,YAAY,iBAAiB;AACnC,MAAI,CAAC,UACJ,OAAM,IAAI,MAAM,gDAAgD,EAAE,MAAM,IAAI,IAAI;AAEjF,QAAM,UAAU,iBAAiB,SAAS,gBAAgB;;AAG3D,QAAO,EAAE,OAAO,OAAO"}

package/up-migrations/sqlite-proxy.cjs

@@ -0,0 +1,80 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+const require_up_migrations_utils = require('./utils.cjs');
+let __sql_sql_ts = require("../sql/sql.cjs");
+
+//#region src/up-migrations/sqlite-proxy.ts
+/**
+* Detects the current version of the migrations table schema and upgrades it if needed.
+*
+* Version 0: Original schema (id, hash, created_at)
+* Version 1: Extended schema (id, hash, created_at, name, applied_at)
+*/
+async function upgradeAsyncIfNeeded(migrationsTable, db, callback, localMigrations) {
+	if ((await db.session.values(__sql_sql_ts.sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`)).length === 0) return { newDb: true };
+	const rows = await db.session.values(__sql_sql_ts.sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`);
+	const version = require_up_migrations_utils.GET_VERSION_FOR.sqlite(rows.map((r) => r[0]));
+	for (let v = version; v < require_up_migrations_utils.MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {
+		const upgradeFn = upgradeAsyncFunctions[v];
+		if (!upgradeFn) throw new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);
+		await upgradeFn(migrationsTable, db, callback, localMigrations);
+	}
+	return { newDb: false };
+}
+const upgradeAsyncFunctions = { 0: async (migrationsTable, db, callback, localMigrations) => {
+	const table = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(migrationsTable)}`;
+	const dbRows = (await db.session.values(__sql_sql_ts.sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`)).map((row) => ({
+		id: row[0],
+		hash: row[1],
+		created_at: row[2]
+	}));
+	localMigrations.sort((a, b) => a.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? "").localeCompare(b.name ?? ""));
+	const byMillis = /* @__PURE__ */ new Map();
+	const byHash = /* @__PURE__ */ new Map();
+	for (const lm of localMigrations) {
+		if (!byMillis.has(lm.folderMillis)) byMillis.set(lm.folderMillis, []);
+		byMillis.get(lm.folderMillis).push(lm);
+		byHash.set(lm.hash, lm);
+	}
+	const toApply = [];
+	let unmatched = [];
+	for (const dbRow of dbRows) {
+		const stringified = String(dbRow.created_at);
+		const millis = Number(stringified.substring(0, stringified.length - 3) + "000");
+		const candidates = byMillis.get(millis);
+		let matched;
+		let matchedBy = null;
+		if (candidates && candidates.length === 1) {
+			matched = candidates[0];
+			matchedBy = "millis";
+		} else if (candidates && candidates.length > 1) {
+			matched = candidates.find((c) => c.hash && dbRow.hash && c.hash === dbRow.hash);
+			if (matched) matchedBy = "hash";
+		} else {
+			matched = byHash.get(dbRow.hash);
+			if (matched) matchedBy = "hash";
+		}
+		if (matched) toApply.push({
+			id: dbRow.id,
+			name: matched.name,
+			hash: dbRow.hash,
+			created_at: stringified,
+			matchedBy: dbRow.id ? "id" : matchedBy
+		});
+		else unmatched.push(dbRow);
+	}
+	if (unmatched.length > 0) throw Error(`While upgrading your database migrations table we found ${unmatched.length} (${unmatched.map((it) => `[id: ${it.id}, created_at: ${it.created_at}]`).join(", ")}) migrations in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`);
+	const statements = [db.dialect.sqlToQuery(__sql_sql_ts.sql`ALTER TABLE ${table} ADD COLUMN ${__sql_sql_ts.sql.identifier("name")} text`.inlineParams()).sql, db.dialect.sqlToQuery(__sql_sql_ts.sql`ALTER TABLE ${table} ADD COLUMN ${__sql_sql_ts.sql.identifier("applied_at")} TEXT`.inlineParams()).sql];
+	for (const backfillEntry of toApply) {
+		const updateQuery = __sql_sql_ts.sql`UPDATE ${table} SET ${__sql_sql_ts.sql.identifier("name")} = ${backfillEntry.name}, ${__sql_sql_ts.sql.identifier("applied_at")} = NULL WHERE`;
+		if (backfillEntry.id) updateQuery.append(__sql_sql_ts.sql` ${__sql_sql_ts.sql.identifier("id")} = ${backfillEntry.id}`);
+		else if (backfillEntry.matchedBy === "millis") updateQuery.append(__sql_sql_ts.sql` ${__sql_sql_ts.sql.identifier("created_at")} = ${backfillEntry.created_at}`);
+		else updateQuery.append(__sql_sql_ts.sql` ${__sql_sql_ts.sql.identifier("hash")} = ${backfillEntry.hash}`);
+		statements.push(db.dialect.sqlToQuery(updateQuery.inlineParams()).sql);
+	}
+	await callback(statements);
+} };
+
+//#endregion
+exports.upgradeAsyncIfNeeded = upgradeAsyncIfNeeded;
+//# sourceMappingURL=sqlite-proxy.cjs.map

package/up-migrations/sqlite-proxy.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqlite-proxy.cjs","names":["GET_VERSION_FOR","MIGRATIONS_TABLE_VERSIONS","sql"],"sources":["../../src/up-migrations/sqlite-proxy.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport { sql } from '~/sql/sql.ts';\nimport type { BaseSQLiteDatabase } from '~/sqlite-core/index.ts';\nimport type { SqliteRemoteDatabase } from '~/sqlite-proxy/index.ts';\nimport type { ProxyMigrator } from '~/sqlite-proxy/migrator.ts';\nimport { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS, type UpgradeResult } from './utils.ts';\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeAsyncIfNeeded(\n\tmigrationsTable: string,\n\tdb: SqliteRemoteDatabase<Record<string, unknown>>,\n\tcallback: ProxyMigrator,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst tableExists = await db.session.values<[1]>(\n\t\tsql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`,\n\t);\n\n\tif (tableExists.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await db.session.values<[string]>(\n\t\tsql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`,\n\t);\n\n\tconst version = GET_VERSION_FOR.sqlite(rows.map((r) => r[0]));\n\n\tfor (let v = version; v < MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {\n\t\tconst upgradeFn = upgradeAsyncFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, db, callback, localMigrations);\n\t}\n\n\treturn { newDb: false };\n}\n\nconst upgradeAsyncFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tdb: BaseSQLiteDatabase<'async', unknown, Record<string, unknown>>,\n\t\tcallback: ProxyMigrator,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, db, callback, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\t// this can be null from legacy implementation where id was serial\n\t\tconst dbRows = (await db.session.values<[number | null, string, number]>(\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t)).map((row) => ({\n\t\t\tid: row[0],\n\t\t\thash: row[1],\n\t\t\tcreated_at: row[2],\n\t\t}));\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\n\t\t// id can be null from legacy implementation where id was serial\n\t\tconst toApply: {\n\t\t\tid: number | null;\n\t\t\tname: string;\n\t\t\thash: string;\n\t\t\tcreated_at: string;\n\t\t\tmatchedBy: 'id' | 'hash' | 'millis';\n\t\t}[] = [];\n\n\t\t// id can be null from legacy implementation where id was serial\n\t\t// hash can only be '' for bun-sqlite journal entries\n\t\tlet unmatched: { id: number | null; hash: string; created_at: number }[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\t\t\tlet matchedBy: 'hash' | 'millis' | null = null;\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t\tmatchedBy = 'millis';\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash && dbRow.hash && c.hash === dbRow.hash); // for bun-sqlite cases (journal had empty hash)\n\t\t\t\tif (matched) matchedBy = 'hash';\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t\tif (matched) matchedBy = 'hash';\n\t\t\t}\n\n\t\t\tif (matched) {\n\t\t\t\ttoApply.push({\n\t\t\t\t\tid: dbRow.id,\n\t\t\t\t\tname: matched.name,\n\t\t\t\t\thash: dbRow.hash,\n\t\t\t\t\tcreated_at: stringified,\n\t\t\t\t\tmatchedBy: dbRow.id ? 'id' : matchedBy!,\n\t\t\t\t});\n\t\t\t} else unmatched.push(dbRow);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatched.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatched.length} (${\n\t\t\t\t\tunmatched.map((it) => `[id: ${it.id}, created_at: ${it.created_at}]`).join(', ')\n\t\t\t\t}) migrations in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tconst statements: string[] = [\n\t\t\tdb.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier('name')} text`.inlineParams()).sql,\n\t\t\tdb.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier('applied_at')} TEXT`.inlineParams())\n\t\t\t\t.sql,\n\t\t];\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tconst updateQuery = sql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\tsql.identifier('applied_at')\n\t\t\t} = NULL WHERE`;\n\n\t\t\t// id\n\t\t\t// created_at\n\t\t\t// hash\n\t\t\tif (backfillEntry.id) updateQuery.append(sql` ${sql.identifier('id')} = ${backfillEntry.id}`);\n\t\t\telse if (backfillEntry.matchedBy === 'millis') {\n\t\t\t\tupdateQuery.append(sql` ${sql.identifier('created_at')} = ${backfillEntry.created_at}`);\n\t\t\t} else updateQuery.append(sql` ${sql.identifier('hash')} = ${backfillEntry.hash}`);\n\n\t\t\tstatements.push(db.dialect.sqlToQuery(updateQuery.inlineParams()).sql);\n\t\t}\n\n\t\tawait callback(statements);\n\t\treturn;\n\t},\n};\n"],"mappings":"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"}

package/up-migrations/sqlite-proxy.d.cts

@@ -0,0 +1,16 @@
+import { UpgradeResult } from "./utils.cjs";
+import { MigrationMeta } from "../migrator.cjs";
+import { SqliteRemoteDatabase } from "../sqlite-proxy/index.cjs";
+import { ProxyMigrator } from "../sqlite-proxy/migrator.cjs";
+
+//#region src/up-migrations/sqlite-proxy.d.ts
+/**
+ * Detects the current version of the migrations table schema and upgrades it if needed.
+ *
+ * Version 0: Original schema (id, hash, created_at)
+ * Version 1: Extended schema (id, hash, created_at, name, applied_at)
+ */
+declare function upgradeAsyncIfNeeded(migrationsTable: string, db: SqliteRemoteDatabase<Record<string, unknown>>, callback: ProxyMigrator, localMigrations: MigrationMeta[]): Promise<UpgradeResult>;
+//#endregion
+export { upgradeAsyncIfNeeded };
+//# sourceMappingURL=sqlite-proxy.d.cts.map

package/up-migrations/sqlite-proxy.d.ts

@@ -0,0 +1,16 @@
+import { UpgradeResult } from "./utils.js";
+import { MigrationMeta } from "../migrator.js";
+import { SqliteRemoteDatabase } from "../sqlite-proxy/index.js";
+import { ProxyMigrator } from "../sqlite-proxy/migrator.js";
+
+//#region src/up-migrations/sqlite-proxy.d.ts
+/**
+ * Detects the current version of the migrations table schema and upgrades it if needed.
+ *
+ * Version 0: Original schema (id, hash, created_at)
+ * Version 1: Extended schema (id, hash, created_at, name, applied_at)
+ */
+declare function upgradeAsyncIfNeeded(migrationsTable: string, db: SqliteRemoteDatabase<Record<string, unknown>>, callback: ProxyMigrator, localMigrations: MigrationMeta[]): Promise<UpgradeResult>;
+//#endregion
+export { upgradeAsyncIfNeeded };
+//# sourceMappingURL=sqlite-proxy.d.ts.map

package/up-migrations/sqlite-proxy.js

@@ -0,0 +1,78 @@
+import { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS } from "./utils.js";
+import { sql } from "../sql/sql.js";
+
+//#region src/up-migrations/sqlite-proxy.ts
+/**
+* Detects the current version of the migrations table schema and upgrades it if needed.
+*
+* Version 0: Original schema (id, hash, created_at)
+* Version 1: Extended schema (id, hash, created_at, name, applied_at)
+*/
+async function upgradeAsyncIfNeeded(migrationsTable, db, callback, localMigrations) {
+	if ((await db.session.values(sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`)).length === 0) return { newDb: true };
+	const rows = await db.session.values(sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`);
+	const version = GET_VERSION_FOR.sqlite(rows.map((r) => r[0]));
+	for (let v = version; v < MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {
+		const upgradeFn = upgradeAsyncFunctions[v];
+		if (!upgradeFn) throw new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);
+		await upgradeFn(migrationsTable, db, callback, localMigrations);
+	}
+	return { newDb: false };
+}
+const upgradeAsyncFunctions = { 0: async (migrationsTable, db, callback, localMigrations) => {
+	const table = sql`${sql.identifier(migrationsTable)}`;
+	const dbRows = (await db.session.values(sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`)).map((row) => ({
+		id: row[0],
+		hash: row[1],
+		created_at: row[2]
+	}));
+	localMigrations.sort((a, b) => a.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? "").localeCompare(b.name ?? ""));
+	const byMillis = /* @__PURE__ */ new Map();
+	const byHash = /* @__PURE__ */ new Map();
+	for (const lm of localMigrations) {
+		if (!byMillis.has(lm.folderMillis)) byMillis.set(lm.folderMillis, []);
+		byMillis.get(lm.folderMillis).push(lm);
+		byHash.set(lm.hash, lm);
+	}
+	const toApply = [];
+	let unmatched = [];
+	for (const dbRow of dbRows) {
+		const stringified = String(dbRow.created_at);
+		const millis = Number(stringified.substring(0, stringified.length - 3) + "000");
+		const candidates = byMillis.get(millis);
+		let matched;
+		let matchedBy = null;
+		if (candidates && candidates.length === 1) {
+			matched = candidates[0];
+			matchedBy = "millis";
+		} else if (candidates && candidates.length > 1) {
+			matched = candidates.find((c) => c.hash && dbRow.hash && c.hash === dbRow.hash);
+			if (matched) matchedBy = "hash";
+		} else {
+			matched = byHash.get(dbRow.hash);
+			if (matched) matchedBy = "hash";
+		}
+		if (matched) toApply.push({
+			id: dbRow.id,
+			name: matched.name,
+			hash: dbRow.hash,
+			created_at: stringified,
+			matchedBy: dbRow.id ? "id" : matchedBy
+		});
+		else unmatched.push(dbRow);
+	}
+	if (unmatched.length > 0) throw Error(`While upgrading your database migrations table we found ${unmatched.length} (${unmatched.map((it) => `[id: ${it.id}, created_at: ${it.created_at}]`).join(", ")}) migrations in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`);
+	const statements = [db.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier("name")} text`.inlineParams()).sql, db.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier("applied_at")} TEXT`.inlineParams()).sql];
+	for (const backfillEntry of toApply) {
+		const updateQuery = sql`UPDATE ${table} SET ${sql.identifier("name")} = ${backfillEntry.name}, ${sql.identifier("applied_at")} = NULL WHERE`;
+		if (backfillEntry.id) updateQuery.append(sql` ${sql.identifier("id")} = ${backfillEntry.id}`);
+		else if (backfillEntry.matchedBy === "millis") updateQuery.append(sql` ${sql.identifier("created_at")} = ${backfillEntry.created_at}`);
+		else updateQuery.append(sql` ${sql.identifier("hash")} = ${backfillEntry.hash}`);
+		statements.push(db.dialect.sqlToQuery(updateQuery.inlineParams()).sql);
+	}
+	await callback(statements);
+} };
+
+//#endregion
+export { upgradeAsyncIfNeeded };
+//# sourceMappingURL=sqlite-proxy.js.map

package/up-migrations/sqlite-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqlite-proxy.js","names":[],"sources":["../../src/up-migrations/sqlite-proxy.ts"],"sourcesContent":["import type { MigrationMeta } from '~/migrator.ts';\nimport { sql } from '~/sql/sql.ts';\nimport type { BaseSQLiteDatabase } from '~/sqlite-core/index.ts';\nimport type { SqliteRemoteDatabase } from '~/sqlite-proxy/index.ts';\nimport type { ProxyMigrator } from '~/sqlite-proxy/migrator.ts';\nimport { GET_VERSION_FOR, MIGRATIONS_TABLE_VERSIONS, type UpgradeResult } from './utils.ts';\n\n/**\n * Detects the current version of the migrations table schema and upgrades it if needed.\n *\n * Version 0: Original schema (id, hash, created_at)\n * Version 1: Extended schema (id, hash, created_at, name, applied_at)\n */\nexport async function upgradeAsyncIfNeeded(\n\tmigrationsTable: string,\n\tdb: SqliteRemoteDatabase<Record<string, unknown>>,\n\tcallback: ProxyMigrator,\n\tlocalMigrations: MigrationMeta[],\n): Promise<UpgradeResult> {\n\t// Check if the table exists at all\n\tconst tableExists = await db.session.values<[1]>(\n\t\tsql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`,\n\t);\n\n\tif (tableExists.length === 0) {\n\t\treturn { newDb: true };\n\t}\n\n\t// Table exists, check table shape\n\tconst rows = await db.session.values<[string]>(\n\t\tsql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`,\n\t);\n\n\tconst version = GET_VERSION_FOR.sqlite(rows.map((r) => r[0]));\n\n\tfor (let v = version; v < MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {\n\t\tconst upgradeFn = upgradeAsyncFunctions[v];\n\t\tif (!upgradeFn) {\n\t\t\tthrow new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);\n\t\t}\n\t\tawait upgradeFn(migrationsTable, db, callback, localMigrations);\n\t}\n\n\treturn { newDb: false };\n}\n\nconst upgradeAsyncFunctions: Record<\n\tnumber,\n\t(\n\t\tmigrationsTable: string,\n\t\tdb: BaseSQLiteDatabase<'async', unknown, Record<string, unknown>>,\n\t\tcallback: ProxyMigrator,\n\t\tlocalMigrations: MigrationMeta[],\n\t) => Promise<void>\n> = {\n\t/**\n\t * Upgrade from version 0 to version 1:\n\t * 1. Read all existing DB migrations\n\t * 2. Sort localMigrations ASC by millis and if the same - sort by name\n\t * 3. Match each DB row to a local migration\n\t * If multiple migrations share the same second, use hash matching as a tiebreaker\n\t * Not implemented for now -> If hash matching fails, fall back to serial id ordering\n\t * 5. Create extra column and backfill names for matched migrations\n\t */\n\t0: async (migrationsTable, db, callback, localMigrations) => {\n\t\tconst table = sql`${sql.identifier(migrationsTable)}`;\n\n\t\t// 1. Read all existing DB migrations\n\t\t// Sort them by ids asc (order how they were applied)\n\t\t// this can be null from legacy implementation where id was serial\n\t\tconst dbRows = (await db.session.values<[number | null, string, number]>(\n\t\t\tsql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`,\n\t\t)).map((row) => ({\n\t\t\tid: row[0],\n\t\t\thash: row[1],\n\t\t\tcreated_at: row[2],\n\t\t}));\n\n\t\t// 2. Sort ASC by millis and if the same - sort by name\n\t\tlocalMigrations.sort((a, b) =>\n\t\t\ta.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? '').localeCompare(b.name ?? '')\n\t\t);\n\n\t\tconst byMillis = new Map<number, MigrationMeta[]>();\n\t\tconst byHash = new Map<string, MigrationMeta>();\n\t\tfor (const lm of localMigrations) {\n\t\t\tif (!byMillis.has(lm.folderMillis)) {\n\t\t\t\tbyMillis.set(lm.folderMillis, []);\n\t\t\t}\n\t\t\tbyMillis.get(lm.folderMillis)!.push(lm);\n\t\t\tbyHash.set(lm.hash, lm);\n\t\t}\n\n\t\t// \t3. Match each DB row to a local migration\n\t\t// \tPriority: millis -> hash\n\n\t\t// id can be null from legacy implementation where id was serial\n\t\tconst toApply: {\n\t\t\tid: number | null;\n\t\t\tname: string;\n\t\t\thash: string;\n\t\t\tcreated_at: string;\n\t\t\tmatchedBy: 'id' | 'hash' | 'millis';\n\t\t}[] = [];\n\n\t\t// id can be null from legacy implementation where id was serial\n\t\t// hash can only be '' for bun-sqlite journal entries\n\t\tlet unmatched: { id: number | null; hash: string; created_at: number }[] = [];\n\n\t\tfor (const dbRow of dbRows) {\n\t\t\tconst stringified = String(dbRow.created_at);\n\t\t\tconst millis = Number(stringified.substring(0, stringified.length - 3) + '000');\n\t\t\tconst candidates = byMillis.get(millis);\n\n\t\t\tlet matched: MigrationMeta | undefined;\n\t\t\tlet matchedBy: 'hash' | 'millis' | null = null;\n\t\t\tif (candidates && candidates.length === 1) {\n\t\t\t\tmatched = candidates[0];\n\t\t\t\tmatchedBy = 'millis';\n\t\t\t} else if (candidates && candidates.length > 1) {\n\t\t\t\tmatched = candidates.find((c) => c.hash && dbRow.hash && c.hash === dbRow.hash); // for bun-sqlite cases (journal had empty hash)\n\t\t\t\tif (matched) matchedBy = 'hash';\n\t\t\t} else {\n\t\t\t\tmatched = byHash.get(dbRow.hash);\n\t\t\t\tif (matched) matchedBy = 'hash';\n\t\t\t}\n\n\t\t\tif (matched) {\n\t\t\t\ttoApply.push({\n\t\t\t\t\tid: dbRow.id,\n\t\t\t\t\tname: matched.name,\n\t\t\t\t\thash: dbRow.hash,\n\t\t\t\t\tcreated_at: stringified,\n\t\t\t\t\tmatchedBy: dbRow.id ? 'id' : matchedBy!,\n\t\t\t\t});\n\t\t\t} else unmatched.push(dbRow);\n\t\t}\n\n\t\t// 4. Check for unmatched\n\t\t// Our assumption on this migration flow is that all DB entries should be matched to a local migration\n\t\t// (if same seconds - fallback to hash, if hash fails - corner case)\n\t\t// If there are unmatched entries, it means that the local environment is missing migrations that have been applied to the DB,\n\t\t// which can lead to inconsistencies and potential issues when running future migrations\n\t\tif (unmatched.length > 0) {\n\t\t\tthrow Error(\n\t\t\t\t`While upgrading your database migrations table we found ${unmatched.length} (${\n\t\t\t\t\tunmatched.map((it) => `[id: ${it.id}, created_at: ${it.created_at}]`).join(', ')\n\t\t\t\t}) migrations in the database that do not match any local migration. This means that some migrations were applied to the database but are missing from the local environment`,\n\t\t\t);\n\t\t}\n\n\t\t// 5. Create extra column and backfill names for matched migrations\n\t\tconst statements: string[] = [\n\t\t\tdb.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier('name')} text`.inlineParams()).sql,\n\t\t\tdb.dialect.sqlToQuery(sql`ALTER TABLE ${table} ADD COLUMN ${sql.identifier('applied_at')} TEXT`.inlineParams())\n\t\t\t\t.sql,\n\t\t];\n\t\tfor (const backfillEntry of toApply) {\n\t\t\tconst updateQuery = sql`UPDATE ${table} SET ${sql.identifier('name')} = ${backfillEntry.name}, ${\n\t\t\t\tsql.identifier('applied_at')\n\t\t\t} = NULL WHERE`;\n\n\t\t\t// id\n\t\t\t// created_at\n\t\t\t// hash\n\t\t\tif (backfillEntry.id) updateQuery.append(sql` ${sql.identifier('id')} = ${backfillEntry.id}`);\n\t\t\telse if (backfillEntry.matchedBy === 'millis') {\n\t\t\t\tupdateQuery.append(sql` ${sql.identifier('created_at')} = ${backfillEntry.created_at}`);\n\t\t\t} else updateQuery.append(sql` ${sql.identifier('hash')} = ${backfillEntry.hash}`);\n\n\t\t\tstatements.push(db.dialect.sqlToQuery(updateQuery.inlineParams()).sql);\n\t\t}\n\n\t\tawait callback(statements);\n\t\treturn;\n\t},\n};\n"],"mappings":";;;;;;;;;;AAaA,eAAsB,qBACrB,iBACA,IACA,UACA,iBACyB;AAMzB,MAJoB,MAAM,GAAG,QAAQ,OACpC,GAAG,+DAA+D,kBAClE,EAEe,WAAW,EAC1B,QAAO,EAAE,OAAO,MAAM;CAIvB,MAAM,OAAO,MAAM,GAAG,QAAQ,OAC7B,GAAG,qDAAqD,gBAAgB,GACxE;CAED,MAAM,UAAU,gBAAgB,OAAO,KAAK,KAAK,MAAM,EAAE,GAAG,CAAC;AAE7D,MAAK,IAAI,IAAI,SAAS,IAAI,0BAA0B,QAAQ,KAAK;EAChE,MAAM,YAAY,sBAAsB;AACxC,MAAI,CAAC,UACJ,OAAM,IAAI,MAAM,gDAAgD,EAAE,MAAM,IAAI,IAAI;AAEjF,QAAM,UAAU,iBAAiB,IAAI,UAAU,gBAAgB;;AAGhE,QAAO,EAAE,OAAO,OAAO;;AAGxB,MAAM,wBAQF,EAUH,GAAG,OAAO,iBAAiB,IAAI,UAAU,oBAAoB;CAC5D,MAAM,QAAQ,GAAG,GAAG,IAAI,WAAW,gBAAgB;CAKnD,MAAM,UAAU,MAAM,GAAG,QAAQ,OAChC,GAAG,oCAAoC,MAAM,kBAC7C,EAAE,KAAK,SAAS;EAChB,IAAI,IAAI;EACR,MAAM,IAAI;EACV,YAAY,IAAI;EAChB,EAAE;AAGH,iBAAgB,MAAM,GAAG,MACxB,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,IAAI,cAAc,EAAE,QAAQ,GAAG,CAChH;CAED,MAAM,2BAAW,IAAI,KAA8B;CACnD,MAAM,yBAAS,IAAI,KAA4B;AAC/C,MAAK,MAAM,MAAM,iBAAiB;AACjC,MAAI,CAAC,SAAS,IAAI,GAAG,aAAa,CACjC,UAAS,IAAI,GAAG,cAAc,EAAE,CAAC;AAElC,WAAS,IAAI,GAAG,aAAa,CAAE,KAAK,GAAG;AACvC,SAAO,IAAI,GAAG,MAAM,GAAG;;CAOxB,MAAM,UAMA,EAAE;CAIR,IAAI,YAAuE,EAAE;AAE7E,MAAK,MAAM,SAAS,QAAQ;EAC3B,MAAM,cAAc,OAAO,MAAM,WAAW;EAC5C,MAAM,SAAS,OAAO,YAAY,UAAU,GAAG,YAAY,SAAS,EAAE,GAAG,MAAM;EAC/E,MAAM,aAAa,SAAS,IAAI,OAAO;EAEvC,IAAI;EACJ,IAAI,YAAsC;AAC1C,MAAI,cAAc,WAAW,WAAW,GAAG;AAC1C,aAAU,WAAW;AACrB,eAAY;aACF,cAAc,WAAW,SAAS,GAAG;AAC/C,aAAU,WAAW,MAAM,MAAM,EAAE,QAAQ,MAAM,QAAQ,EAAE,SAAS,MAAM,KAAK;AAC/E,OAAI,QAAS,aAAY;SACnB;AACN,aAAU,OAAO,IAAI,MAAM,KAAK;AAChC,OAAI,QAAS,aAAY;;AAG1B,MAAI,QACH,SAAQ,KAAK;GACZ,IAAI,MAAM;GACV,MAAM,QAAQ;GACd,MAAM,MAAM;GACZ,YAAY;GACZ,WAAW,MAAM,KAAK,OAAO;GAC7B,CAAC;MACI,WAAU,KAAK,MAAM;;AAQ7B,KAAI,UAAU,SAAS,EACtB,OAAM,MACL,2DAA2D,UAAU,OAAO,IAC3E,UAAU,KAAK,OAAO,QAAQ,GAAG,GAAG,gBAAgB,GAAG,WAAW,GAAG,CAAC,KAAK,KAAK,CAChF,6KACD;CAIF,MAAM,aAAuB,CAC5B,GAAG,QAAQ,WAAW,GAAG,eAAe,MAAM,cAAc,IAAI,WAAW,OAAO,CAAC,OAAO,cAAc,CAAC,CAAC,KAC1G,GAAG,QAAQ,WAAW,GAAG,eAAe,MAAM,cAAc,IAAI,WAAW,aAAa,CAAC,OAAO,cAAc,CAAC,CAC7G,IACF;AACD,MAAK,MAAM,iBAAiB,SAAS;EACpC,MAAM,cAAc,GAAG,UAAU,MAAM,OAAO,IAAI,WAAW,OAAO,CAAC,KAAK,cAAc,KAAK,IAC5F,IAAI,WAAW,aAAa,CAC5B;AAKD,MAAI,cAAc,GAAI,aAAY,OAAO,GAAG,IAAI,IAAI,WAAW,KAAK,CAAC,KAAK,cAAc,KAAK;WACpF,cAAc,cAAc,SACpC,aAAY,OAAO,GAAG,IAAI,IAAI,WAAW,aAAa,CAAC,KAAK,cAAc,aAAa;MACjF,aAAY,OAAO,GAAG,IAAI,IAAI,WAAW,OAAO,CAAC,KAAK,cAAc,OAAO;AAElF,aAAW,KAAK,GAAG,QAAQ,WAAW,YAAY,cAAc,CAAC,CAAC,IAAI;;AAGvE,OAAM,SAAS,WAAW;GAG3B"}

package/up-migrations/sqlite.cjs

@@ -1,26 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
-let __utils_ts = require("../utils.cjs");
+const require_up_migrations_utils = require('./utils.cjs');
 let __sql_sql_ts = require("../sql/sql.cjs");
 
 //#region src/up-migrations/sqlite.ts
-const CURRENT_MIGRATION_TABLE_VERSION = 1;
-function getVersion(columns) {
-	if (columns.includes("name")) return 1;
-	return 0;
-}
-function allSync(session, sqlQuery, resultMapper = () => []) {
-	const result = session.all(sqlQuery);
-	if (result.length === 0) return [];
-	if (Array.isArray(result[0])) return result.map((row) => resultMapper(row));
-	return result;
-}
-async function allAsync(session, sqlQuery, resultMapper = () => []) {
-	const result = await session.all(sqlQuery);
-	if (result.length === 0) return [];
-	if (Array.isArray(result[0])) return result.map((row) => resultMapper(row));
-	return result;
-}
 /**
 * Detects the current version of the migrations table schema and upgrades it if needed.
 *
@@ -28,25 +11,19 @@ async function allAsync(session, sqlQuery, resultMapper = () => []) {
 * Version 1: Extended schema (id, hash, created_at, name, applied_at)
 */
 function upgradeSyncIfNeeded(migrationsTable, session, localMigrations) {
-	if (allSync(session, __sql_sql_ts.sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`, (row) => ({ "1": row[0] })).length === 0) return { newDb: true };
-	const version = getVersion(allSync(session, __sql_sql_ts.sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`, (row) => ({ column_name: row[0] })).map((r) => r.column_name));
-	for (let v = version; v < CURRENT_MIGRATION_TABLE_VERSION; v++) {
+	if (session.all(__sql_sql_ts.sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`).length === 0) return { newDb: true };
+	const rows = session.all(__sql_sql_ts.sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`);
+	const version = require_up_migrations_utils.GET_VERSION_FOR.sqlite(rows.map((r) => r.column_name));
+	for (let v = version; v < require_up_migrations_utils.MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {
 		const upgradeFn = upgradeSyncFunctions[v];
 		if (!upgradeFn) throw new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);
 		upgradeFn(migrationsTable, session, localMigrations);
 	}
-	return {
-		prevVersion: version,
-		currentVersion: CURRENT_MIGRATION_TABLE_VERSION
-	};
+	return { newDb: false };
 }
 const upgradeSyncFunctions = { 0: (migrationsTable, session, localMigrations) => {
 	const table = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(migrationsTable)}`;
-	const dbRows = allSync(session, __sql_sql_ts.sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`, (row) => ({
-		id: row[0],
-		hash: row[1],
-		created_at: row[2]
-	}));
+	const dbRows = session.all(__sql_sql_ts.sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`);
 	localMigrations.sort((a, b) => a.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? "").localeCompare(b.name ?? ""));
 	const byMillis = /* @__PURE__ */ new Map();
 	const byHash = /* @__PURE__ */ new Map();
@@ -101,26 +78,20 @@ const upgradeSyncFunctions = { 0: (migrationsTable, session, localMigrations) =>
 * Version 0: Original schema (id, hash, created_at)
 * Version 1: Extended schema (id, hash, created_at, name, applied_at)
 */
-async function upgradeAsyncIfNeeded(migrationsTable, session, localMigrations, mode = "transaction") {
-	if ((await allAsync(session, __sql_sql_ts.sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`, (row) => ({ "1": row[0] }))).length === 0) return { newDb: true };
-	const version = getVersion((await allAsync(session, __sql_sql_ts.sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`, (row) => ({ column_name: row[0] }))).map((r) => r.column_name));
-	for (let v = version; v < CURRENT_MIGRATION_TABLE_VERSION; v++) {
+async function upgradeAsyncIfNeeded(migrationsTable, db, localMigrations) {
+	if ((await db.session.all(__sql_sql_ts.sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ${migrationsTable}`)).length === 0) return { newDb: true };
+	const rows = await db.session.all(__sql_sql_ts.sql`SELECT name as column_name FROM pragma_table_info(${migrationsTable})`);
+	const version = require_up_migrations_utils.GET_VERSION_FOR.sqlite(rows.map((r) => r.column_name));
+	for (let v = version; v < require_up_migrations_utils.MIGRATIONS_TABLE_VERSIONS.sqlite; v++) {
 		const upgradeFn = upgradeAsyncFunctions[v];
 		if (!upgradeFn) throw new Error(`No upgrade path from migration table version ${v} to ${v + 1}`);
-		await upgradeFn(migrationsTable, session, localMigrations, mode);
+		await upgradeFn(migrationsTable, db, localMigrations);
 	}
-	return {
-		prevVersion: version,
-		currentVersion: CURRENT_MIGRATION_TABLE_VERSION
-	};
+	return { newDb: false };
 }
-const upgradeAsyncFunctions = { 0: async (migrationsTable, session, localMigrations, mode) => {
+const upgradeAsyncFunctions = { 0: async (migrationsTable, db, localMigrations) => {
 	const table = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(migrationsTable)}`;
-	const dbRows = await allAsync(session, __sql_sql_ts.sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`, (row) => ({
-		id: row[0],
-		hash: row[1],
-		created_at: row[2]
-	}));
+	const dbRows = await db.session.all(__sql_sql_ts.sql`SELECT id, hash, created_at FROM ${table} ORDER BY id ASC`);
 	localMigrations.sort((a, b) => a.folderMillis !== b.folderMillis ? a.folderMillis - b.folderMillis : (a.name ?? "").localeCompare(b.name ?? ""));
 	const byMillis = /* @__PURE__ */ new Map();
 	const byHash = /* @__PURE__ */ new Map();
@@ -165,11 +136,9 @@ const upgradeAsyncFunctions = { 0: async (migrationsTable, session, localMigrati
 		else updateQuery.append(__sql_sql_ts.sql` ${__sql_sql_ts.sql.identifier("hash")} = ${backfillEntry.hash}`);
 		statements.push(updateQuery);
 	}
-	if (mode === "transaction") await session.transaction(async (tx) => {
+	await db.transaction(async (tx) => {
 		for (const statement of statements) await tx.run(statement);
 	});
-	else if (mode === "run") for (const statement of statements) await session.run(statement);
-	else (0, __utils_ts.assertUnreachable)(mode);
 } };
 
 //#endregion