Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(ci): parse migration triggers without leaking test runtimes

Timothy Yind961c2e5073a
diff --git a/.github/workflows/workspace-checks.yml b/.github/workflows/workspace-checks.yml
index 89da2366..709b9455 100644
--- a/.github/workflows/workspace-checks.yml
+++ b/.github/workflows/workspace-checks.yml
@@ -33,6 +33,7 @@ jobs:
- run: pnpm check:packages
- run: pnpm lint
- run: pnpm test
+ timeout-minutes: 10
- run: pnpm build:deps
- run: pnpm build
- run: pnpm test:album-http
diff --git a/tests/account-lifecycle-mail.test.ts b/tests/account-lifecycle-mail.test.ts
index 290bacdb..17c4abc4 100644
--- a/tests/account-lifecycle-mail.test.ts
+++ b/tests/account-lifecycle-mail.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import test from 'node:test'
import assert from 'node:assert/strict'
import { readdir, readFile } from 'node:fs/promises'
@@ -33,21 +34,27 @@ async function fixture() {
}),
),
db = await mf.getD1Database('DB')
- for (const file of (
- await readdir(new URL('../packages/platform/migrations/', import.meta.url))
- )
- .filter((f) => f.endsWith('.sql'))
- .sort())
- for (const sql of (
- await readFile(
- new URL('../packages/platform/migrations/' + file, import.meta.url),
- 'utf8',
+ try {
+ for (const file of (
+ await readdir(
+ new URL('../packages/platform/migrations/', import.meta.url),
)
)
- .replace(/^--.*$/gm, '')
- .split(';')
- .filter((s) => s.trim()))
- await db.prepare(sql).run()
+ .filter((f) => f.endsWith('.sql'))
+ .sort())
+ for (const sql of splitSqlQuery(
+ (
+ await readFile(
+ new URL('../packages/platform/migrations/' + file, import.meta.url),
+ 'utf8',
+ )
+ ).replace(/^--.*$/gm, ''),
+ ).filter((s) => s.trim()))
+ await db.prepare(sql).run()
+ } catch (error) {
+ await mf.dispose()
+ throw error
+ }
return { mf, db }
}
test('Lifecycle notices, current-login race, restore, retained deadline and retryable external purge', async () => {
@@ -907,15 +914,14 @@ test('Migration retains known sign-in timestamps and safely enrolls existing acc
.bind(new Date(now - 20 * DAY).toISOString(), now, now + DAY)
.run()
}
- for (const sql of (
- await readFile(
- new URL('../packages/platform/migrations/' + name, import.meta.url),
- 'utf8',
- )
- )
- .replace(/^--.*$/gm, '')
- .split(';')
- .filter((s) => s.trim()))
+ for (const sql of splitSqlQuery(
+ (
+ await readFile(
+ new URL('../packages/platform/migrations/' + name, import.meta.url),
+ 'utf8',
+ )
+ ).replace(/^--.*$/gm, ''),
+ ).filter((s) => s.trim()))
await db.prepare(sql).run()
}
const known = await db
@@ -1433,15 +1439,14 @@ test('Retry-budget migration preserves delivery history and terminates already-e
)
.run()
}
- for (const sql of (
- await readFile(
- new URL('../packages/platform/migrations/' + name, import.meta.url),
- 'utf8',
- )
- )
- .replace(/^--.*$/gm, '')
- .split(';')
- .filter((s) => s.trim()))
+ for (const sql of splitSqlQuery(
+ (
+ await readFile(
+ new URL('../packages/platform/migrations/' + name, import.meta.url),
+ 'utf8',
+ )
+ ).replace(/^--.*$/gm, ''),
+ ).filter((s) => s.trim()))
await db.prepare(sql).run()
}
assert.deepEqual(
diff --git a/tests/cloud-account-security.test.ts b/tests/cloud-account-security.test.ts
index 8cf7e0c1..2124d80b 100644
--- a/tests/cloud-account-security.test.ts
+++ b/tests/cloud-account-security.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -25,9 +26,7 @@ test('Cloud account migration preserves identities and enforces verified registr
new URL('../packages/platform/migrations/' + name, import.meta.url),
'utf8',
)
- for (const statement of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const statement of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(statement).run()
diff --git a/tests/cloud-album-slugs.test.ts b/tests/cloud-album-slugs.test.ts
index 167a418a..3cca69ec 100644
--- a/tests/cloud-album-slugs.test.ts
+++ b/tests/cloud-album-slugs.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -28,9 +29,7 @@ test('Real D1 album slugs share normalization, reserve history/tombstones and is
.filter((n) => n.endsWith('.sql'))
.sort()) {
const sql = await readFile('packages/platform/migrations/' + file, 'utf8')
- for (const statement of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const statement of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(statement).run()
diff --git a/tests/cloud-domains.test.ts b/tests/cloud-domains.test.ts
index 02133aa1..82455684 100644
--- a/tests/cloud-domains.test.ts
+++ b/tests/cloud-domains.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { readFile, readdir } from 'node:fs/promises'
@@ -77,9 +78,7 @@ test('Real D1 custom domains fence claims, CNAME ownership transitions, provider
.filter((f) => f.endsWith('.sql'))
.sort()) {
const sql = await readFile('packages/platform/migrations/' + file, 'utf8')
- for (const q of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const q of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(q).run()
@@ -792,11 +791,11 @@ test('Default-domain migration preserves reserved names and mappings owned by an
try {
const db = await mf.getD1Database('DB')
const apply = async (file: string) => {
- for (const q of (
- await readFile('packages/platform/migrations/' + file, 'utf8')
+ for (const q of splitSqlQuery(
+ (
+ await readFile('packages/platform/migrations/' + file, 'utf8')
+ ).replace(/^--.*$/gm, ''),
)
- .replace(/^--.*$/gm, '')
- .split(';')
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(q).run()
@@ -880,11 +879,11 @@ test('Workspace quotas preserve capacity for other tenants and audit failures ro
for (const file of (await readdir('packages/platform/migrations'))
.filter((f) => f.endsWith('.sql'))
.sort())
- for (const q of (
- await readFile('packages/platform/migrations/' + file, 'utf8')
+ for (const q of splitSqlQuery(
+ (
+ await readFile('packages/platform/migrations/' + file, 'utf8')
+ ).replace(/^--.*$/gm, ''),
)
- .replace(/^--.*$/gm, '')
- .split(';')
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(q).run()
diff --git a/tests/cloud-execution.test.ts b/tests/cloud-execution.test.ts
index f13e50ba..d0180a46 100644
--- a/tests/cloud-execution.test.ts
+++ b/tests/cloud-execution.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -40,9 +41,7 @@ test('D1 queue serializes claims, fences expired attempts, retries and refuses d
new URL('../packages/platform/migrations/' + name, import.meta.url),
'utf8',
)
- for (const sql of migration
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const sql of splitSqlQuery(migration.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(sql).run()
diff --git a/tests/cloud-media-repositories.test.ts b/tests/cloud-media-repositories.test.ts
index bd45e894..d5051919 100644
--- a/tests/cloud-media-repositories.test.ts
+++ b/tests/cloud-media-repositories.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -76,9 +77,7 @@ for (const backend of ['SQLite', 'D1'] as const) {
new URL('../packages/platform/migrations/' + file, import.meta.url),
'utf8',
)
- for (const part of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const part of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await run(part)
@@ -106,9 +105,7 @@ for (const backend of ['SQLite', 'D1'] as const) {
),
'utf8',
))
- for (const part of migration
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const part of splitSqlQuery(migration.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean)) {
if (part.startsWith('ALTER TABLE cloud_uploads'))
@@ -125,9 +122,7 @@ for (const backend of ['SQLite', 'D1'] as const) {
new URL('../packages/platform/migrations/' + file, import.meta.url),
'utf8',
)
- for (const part of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const part of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await run(part)
@@ -302,9 +297,7 @@ test('D1 media sessions and queued jobs survive a workerd restart', async () =>
),
'utf8',
))
- for (const sql of migration
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const sql of splitSqlQuery(migration.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(sql).run()
diff --git a/tests/cloud-resource-parity.test.ts b/tests/cloud-resource-parity.test.ts
index e9b5d31c..730c3bbc 100644
--- a/tests/cloud-resource-parity.test.ts
+++ b/tests/cloud-resource-parity.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -34,9 +35,7 @@ test('Cloud D1 and Self-hosted SQLite share ordering, visibility and protected-a
.filter((n) => n.endsWith('.sql'))
.sort()) {
const sql = await readFile('packages/platform/migrations/' + name, 'utf8')
- for (const statement of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const statement of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(statement).run()
diff --git a/tests/helpers/sql.ts b/tests/helpers/sql.ts
new file mode 100644
index 00000000..a48b7eaf
--- /dev/null
+++ b/tests/helpers/sql.ts
@@ -0,0 +1,6 @@
+import { createRequire } from 'node:module'
+
+// Use the same SQL parser as Wrangler so trigger bodies remain one statement.
+export const splitSqlQuery: (sql: string) => string[] = createRequire(
+ import.meta.url,
+)('wrangler').unstable_splitSqlQuery
diff --git a/tests/platform-entitlements.test.ts b/tests/platform-entitlements.test.ts
index 1731c0fc..eeebb4ee 100644
--- a/tests/platform-entitlements.test.ts
+++ b/tests/platform-entitlements.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import {
createDomainManager,
renameDefaultDomain,
@@ -105,11 +106,12 @@ test('New workspaces are free; empty galleries auto-publish; quotas and managed
for (const f of (await readdir('packages/platform/migrations'))
.filter((f) => f.endsWith('.sql'))
.sort())
- for (const q of (
- await readFile('packages/platform/migrations/' + f, 'utf8')
+ for (const q of splitSqlQuery(
+ (await readFile('packages/platform/migrations/' + f, 'utf8')).replace(
+ /^--.*$/gm,
+ '',
+ ),
)
- .replace(/^--.*$/gm, '')
- .split(';')
.map((v) => v.trim())
.filter(Boolean))
await db.prepare(q).run()
diff --git a/tests/platform-provisioning.test.ts b/tests/platform-provisioning.test.ts
index 78a0021f..eae59550 100644
--- a/tests/platform-provisioning.test.ts
+++ b/tests/platform-provisioning.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import assert from 'node:assert/strict'
import test from 'node:test'
import { createRequire } from 'node:module'
@@ -52,9 +53,7 @@ test('Real D1 provisioning preserves old tenants, serializes defaults and enforc
new URL('../packages/platform/migrations/' + name, import.meta.url),
'utf8',
)
- for (const s of sql
- .replace(/^--.*$/gm, '')
- .split(';')
+ for (const s of splitSqlQuery(sql.replace(/^--.*$/gm, ''))
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(s).run()
diff --git a/tests/platform-subscriptions.test.ts b/tests/platform-subscriptions.test.ts
index a00336e6..8bd6f42b 100644
--- a/tests/platform-subscriptions.test.ts
+++ b/tests/platform-subscriptions.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import { createDomainManager } from '../packages/platform/src/domains.ts'
import test from 'node:test'
import assert from 'node:assert/strict'
@@ -126,11 +127,11 @@ test('Real D1 defaults, live expiry, activation races/idempotency and workspace
for (const file of (await readdir('packages/platform/migrations'))
.filter((f) => f.endsWith('.sql'))
.sort())
- for (const sql of (
- await readFile('packages/platform/migrations/' + file, 'utf8')
+ for (const sql of splitSqlQuery(
+ (
+ await readFile('packages/platform/migrations/' + file, 'utf8')
+ ).replace(/^--.*$/gm, ''),
)
- .replace(/^--.*$/gm, '')
- .split(';')
.map((s) => s.trim())
.filter(Boolean))
await db.prepare(sql).run()
diff --git a/tests/signup-promotions.test.ts b/tests/signup-promotions.test.ts
index 4c86fc4b..b1cce929 100644
--- a/tests/signup-promotions.test.ts
+++ b/tests/signup-promotions.test.ts
@@ -1,3 +1,4 @@
+import { splitSqlQuery } from './helpers/sql.ts'
import test from 'node:test'
import assert from 'node:assert/strict'
import { readdir, readFile } from 'node:fs/promises'
@@ -31,15 +32,14 @@ test('Signup promotions snapshot eligibility at actual registration, grant once
)
.filter((n) => n.endsWith('.sql'))
.sort())
- for (const sql of (
- await readFile(
- new URL('../packages/platform/migrations/' + file, import.meta.url),
- 'utf8',
- )
- )
- .replace(/^--.*$/gm, '')
- .split(';')
- .filter((s) => s.trim()))
+ for (const sql of splitSqlQuery(
+ (
+ await readFile(
+ new URL('../packages/platform/migrations/' + file, import.meta.url),
+ 'utf8',
+ )
+ ).replace(/^--.*$/gm, ''),
+ ).filter((s) => s.trim()))
await db.prepare(sql).run()
const now = Date.now(),
day = 86400000