@runeditrun/rer 0.2.72 → 0.2.74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/README.md +13 -0
- package/cli/adapter.mjs +1 -0
- package/cli/contract.mjs +1 -1
- package/cli/deploy-owner-input.mjs +5 -2
- package/cli/export-summary.mjs +5 -3
- package/cli/hosted-export-command.mjs +47 -0
- package/cli/hosted-export.mjs +8 -5
- package/cli/inspect.mjs +6 -0
- package/cli/main.mjs +1 -1
- package/cli/output.mjs +1 -1
- package/cli/parse.mjs +1 -0
- package/cli/portability-worker.mjs +9 -8
- package/cli/release.mjs +9 -0
- package/cli/transfers.mjs +3 -0
- package/global/CHANGELOG.md +18 -0
- package/modules/container/build.mjs +2 -1
- package/modules/operator-auth/README.md +9 -3
- package/modules/operator-auth/dev/index.mjs +1 -1
- package/modules/operator-auth/dev-gate.mjs +18 -6
- package/modules/operator-auth/index.d.mts +3 -0
- package/modules/operator-auth/scheduled/definition.mjs +3 -1
- package/modules/operator-auth/scheduled/expiry.mjs +2 -2
- package/modules/operator-auth/scheduled/fence.mjs +2 -1
- package/modules/operator-auth/scheduled/runner.mjs +13 -5
- package/modules/portability/README.md +34 -8
- package/modules/portability/backfills.mjs +22 -14
- package/modules/portability/bookkeeping.mjs +6 -1
- package/modules/portability/bridge.mjs +9 -6
- package/modules/portability/import.mjs +7 -4
- package/modules/portability/migration-sql.mjs +8 -0
- package/modules/portability/migration-statements.mjs +22 -17
- package/modules/portability/rebuilds.mjs +106 -0
- package/modules/portability/replay-views.mjs +35 -0
- package/modules/portability/storage.mjs +9 -2
- package/modules/release/produce.mjs +5 -3
- package/modules/release/publication-scan.mjs +5 -4
- package/package.json +1 -1
- package/scripts/publish-check/README.md +6 -1
- package/scripts/publish-check/cli.py +49 -5
- package/scripts/publish-check/history_hydration.py +4 -1
- package/scripts/publish-check/slots.py +67 -0
- package/scripts/publish-check/timeout.json +1 -0
- package/scripts/publish-check/timeout.mjs +14 -0
- package/scripts/publish-check.mjs +27 -8
|
@@ -59,6 +59,7 @@ belong to the current runtime or environment and never travel:
|
|
|
59
59
|
| `sqlite_%`, `_cf_%` | SQLite and Cloudflare internals. |
|
|
60
60
|
| `d1_migrations`, `_rer_deploy_migrations`, `_rer_portability_migrations`, `rer_migrations` | Destination migration history. Base uses the D1 and `_rer_` ledgers; RER Platform's runner writes `rer_migrations`. An old archive that still carries its source's ledger is placed by it (see below); its rows are never restored. |
|
|
61
61
|
| `rer_portability_%` | Transfer jobs, snapshots, staging, journals and recovery bookkeeping. |
|
|
62
|
+
| `ik_d1_assertions` | Import-kit CHECK guards, cleared within every successful migration or batch. Never owner data. |
|
|
62
63
|
| `rer_mail_development_outbox`, `rer_ai_development_outbox` | Local development effect captures. |
|
|
63
64
|
| `rer_dependency_keys`, `rer_dependency_pending`, `rer_dependency_codes` | Provider secrets and transient linking credentials. |
|
|
64
65
|
| `rer_command_receipts` | Command replay receipts tied to the source installation. |
|
|
@@ -242,6 +243,12 @@ checks; this does not waive checks on any remaining table. `imports.status(id)`
|
|
|
242
243
|
reports their names in `skippedTables`. File and HTTP CLI imports print one line
|
|
243
244
|
when any are skipped: `Skipped platform bookkeeping tables: <names>.`
|
|
244
245
|
|
|
246
|
+
An old archive may carry an empty `ik_d1_assertions` table. Import skips it so
|
|
247
|
+
later import-kit guard migrations do not count as writes to restored data.
|
|
248
|
+
An archive declaring rows in that table is refused with
|
|
249
|
+
`invalid_bookkeeping_rows:<table>` (HTTP 409): a successful guard unit cannot
|
|
250
|
+
leave those rows committed.
|
|
251
|
+
|
|
245
252
|
Version 1 archives lack this binding and are refused with
|
|
246
253
|
`legacy_archive_unverifiable` (HTTP 409; local `rer import` exit 4), before
|
|
247
254
|
restoration. Upgrade the original installation and export a new archive.
|
|
@@ -254,10 +261,11 @@ requires version 2 integrity.
|
|
|
254
261
|
|
|
255
262
|
An archive restores into an installation whose schema differs only by migrations
|
|
256
263
|
applied after the archive was made, when those migrations are additive: new
|
|
257
|
-
tables, new columns that are nullable or have a default, and indexes
|
|
264
|
+
tables, new columns that are nullable or have a default, and indexes, or the
|
|
265
|
+
preserving CHECK rebuild described below. The
|
|
258
266
|
archive's tables restore with their archived columns, later columns take their
|
|
259
|
-
defaults, and later tables stay empty
|
|
260
|
-
|
|
267
|
+
defaults, and later tables stay empty unless their eligible seed or backfill is
|
|
268
|
+
replayed below. This applies to normal v2 import and to backup-only v1 recovery.
|
|
261
269
|
|
|
262
270
|
The Base CLI runners (local Workers and container) pass `createPortability` a
|
|
263
271
|
`migrations` replayer (`migration-history.mjs`, Node only) built from the
|
|
@@ -291,7 +299,8 @@ contain only `CREATE TABLE` (not `AS SELECT`), `CREATE INDEX` and
|
|
|
291
299
|
`ALTER TABLE ... ADD COLUMN` (SQLite allows only constant defaults there) on the
|
|
292
300
|
restorable tables. A later migration with any other statement that names a
|
|
293
301
|
restorable table, such as an `INSERT`, `UPDATE` or `DELETE` that purges or
|
|
294
|
-
backfills rows
|
|
302
|
+
backfills rows, is refused with `schema_mismatch` unless admitted or replayed
|
|
303
|
+
below. Bounded trigger and view creation/removal changes only schema. Statements that
|
|
295
304
|
touch only excluded tables are allowed. A data statement (`INSERT`, `REPLACE`,
|
|
296
305
|
`UPDATE` or `DELETE`, including `INSERT ... SELECT` and a leading `WITH`) is
|
|
297
306
|
judged by the table it writes: when that table is outside the restorable
|
|
@@ -312,12 +321,22 @@ keywords outside table position, function names (also table-valued ones such as
|
|
|
312
321
|
literals, numbers and comments never count. Text Base cannot read to a
|
|
313
322
|
statement boundary, such as an unclosed block comment, is refused. An archived table the archive holds no
|
|
314
323
|
rows of restores empty, so an `UPDATE` or `DELETE` of it changes nothing and is
|
|
315
|
-
allowed
|
|
316
|
-
|
|
317
|
-
is still refused. For archives without a migration record,
|
|
324
|
+
allowed regardless of what it reads: no row can change or fire a trigger. An
|
|
325
|
+
ordinary `INSERT` into it remains refused. For archives without a migration record,
|
|
318
326
|
every migration after the earliest prefix that gives the archive's schema is
|
|
319
327
|
checked, since the archive may predate any of them.
|
|
320
328
|
|
|
329
|
+
A complete five-statement `CREATE TABLE copy AS SELECT` / `DROP TABLE` /
|
|
330
|
+
`CREATE TABLE` / `INSERT ... SELECT` / `DROP TABLE copy` sequence within one
|
|
331
|
+
migration is admitted when every column is copied back unchanged and, for a
|
|
332
|
+
populated archived table, its rowid is copied back too. The copy must be local
|
|
333
|
+
to the sequence. Only CHECK clauses may differ; column declarations, defaults,
|
|
334
|
+
collations, other constraints and table options remain unchanged. Manifest
|
|
335
|
+
counts identify empty tables without another row scan. Restore uses the
|
|
336
|
+
destination definition, so a row rejected by its CHECK fails the whole atomic
|
|
337
|
+
restore; no row is skipped or coerced. Other statements still face the usual
|
|
338
|
+
data classifier, and a proven preserving block is not a competing backfill writer.
|
|
339
|
+
|
|
321
340
|
A backfill of a catalogue table the archive does not carry (one a later
|
|
322
341
|
migration adds, restored empty) is **replayed** instead of refused: an
|
|
323
342
|
`INSERT ... SELECT` (or `INSERT ... VALUES`) into that table. Finalize empties
|
|
@@ -332,13 +351,18 @@ scans the restored rows. Rows the restore normalizes (import safety) are read
|
|
|
332
351
|
as restored. The restore is refused with
|
|
333
352
|
`schema_mismatch:migration_data:<migration>` instead when the archive carries
|
|
334
353
|
the table (even with no rows), when a write to it is not a plain `INSERT` or
|
|
335
|
-
`REPLACE`, reads any table other than archived ones and itself
|
|
354
|
+
`REPLACE`, reads any table other than archived ones and itself (including through
|
|
355
|
+
a view resolved from applied migration history), selects `*` or
|
|
336
356
|
a secret column, when a trigger on it or a foreign key action from it reaches a
|
|
337
357
|
catalogue table, when any other later statement writes it (directly or through
|
|
338
358
|
a trigger) or changes its columns other than by `ADD COLUMN` (allowed only when
|
|
339
359
|
every replay names its columns), or when the statement cannot be bounded.
|
|
340
360
|
A failed or interrupted apply leaves no replayed row; finalizing again replays
|
|
341
361
|
from the start.
|
|
362
|
+
Read-only trigger bodies, including RAISE-only guards, add no write dependency.
|
|
363
|
+
Eligible constant seed INSERTs replay too. Statements confined to tables added
|
|
364
|
+
after the archive retain their existing admission when they need no replay;
|
|
365
|
+
an INSERT reading a view must still resolve entirely to carried tables.
|
|
342
366
|
|
|
343
367
|
The same check runs when the archive's schema identity equals the destination's:
|
|
344
368
|
a later migration that only purges or backfills rows leaves the schema unchanged,
|
|
@@ -639,6 +663,8 @@ modules/portability/ledgers.mjs
|
|
|
639
663
|
modules/portability/migration-statements.mjs
|
|
640
664
|
modules/portability/sql-text.mjs
|
|
641
665
|
modules/portability/backfills.mjs
|
|
666
|
+
modules/portability/rebuilds.mjs
|
|
667
|
+
modules/portability/replay-views.mjs
|
|
642
668
|
modules/portability/legacy-safety.mjs
|
|
643
669
|
modules/portability/export.mjs
|
|
644
670
|
modules/portability/import.mjs
|
|
@@ -2,6 +2,8 @@ import { statement, quote, insist } from './storage.mjs';
|
|
|
2
2
|
import { tokens, folded } from './generated.mjs';
|
|
3
3
|
import { changesData, dataStatement, reachingTables, triggerBodies, schemaChange, statementNames } from './migration-statements.mjs';
|
|
4
4
|
import { splitStatements } from './sql-text.mjs';
|
|
5
|
+
import { preservingRebuilds } from './rebuilds.mjs';
|
|
6
|
+
import { replayViews, viewReads } from './replay-views.mjs';
|
|
5
7
|
|
|
6
8
|
// The data statements of later migrations, judged by the tables they write
|
|
7
9
|
// (bridge.mjs placement). Restored rows never pass through a later migration.
|
|
@@ -10,12 +12,13 @@ import { splitStatements } from './sql-text.mjs';
|
|
|
10
12
|
// writes reach no catalogue table through a trigger or foreign key action
|
|
11
13
|
// (reachingTables) changes no restored row, whatever it reads: admitted.
|
|
12
14
|
// - One whose target is a catalogue table the archive does not carry (restored
|
|
13
|
-
// empty)
|
|
14
|
-
//
|
|
15
|
+
// empty) is replayed at finalize when it inserts seed or backfill rows.
|
|
16
|
+
// Every later write to that table must then be a
|
|
15
17
|
// replayable INSERT: they run in migration order, exactly as written, after
|
|
16
18
|
// the archived rows are inserted and with the destination's triggers still
|
|
17
19
|
// dropped, so the table holds what the live upgrade gave it. A replay may read
|
|
18
|
-
// only archived tables (complete by then)
|
|
20
|
+
// only archived tables (complete by then), views over those tables and the
|
|
21
|
+
// table itself, by named
|
|
19
22
|
// columns that are not secret; no trigger on the table may write a catalogue
|
|
20
23
|
// table; no later statement may write it another way (directly or through a
|
|
21
24
|
// trigger) or change its columns other than by ADD COLUMN.
|
|
@@ -25,14 +28,15 @@ import { splitStatements } from './sql-text.mjs';
|
|
|
25
28
|
// Each chunk the runner's splitter handed over is split again at SQLite's own
|
|
26
29
|
// statement boundaries first (sql-text.mjs), so a trigger glued to the
|
|
27
30
|
// statements after it is judged as the statements it holds.
|
|
28
|
-
// Returns the replays in migration order, or refuses with the first migration
|
|
31
|
+
// Returns the replays in migration order and the proven CHECK rebuilds, or refuses with the first migration
|
|
29
32
|
// (in `unapplied` order) holding a statement that cannot be admitted.
|
|
30
|
-
export function laterData({applied,unapplied,replay,catalogue,archived,empty,tables,secrets}) {
|
|
33
|
+
export function laterData({applied,unapplied,replay,catalogue,archived,empty,tables,secrets,manifest}) {
|
|
31
34
|
const split=name=>replay.statements(name).flatMap(splitStatements),fold=list=>list.map(folded);
|
|
32
35
|
const statements=applied.flatMap(split);
|
|
33
36
|
const restorable=fold(catalogue),carried=fold(archived),absent=restorable.filter(name=>!carried.includes(name));
|
|
34
37
|
const reached=reachingTables(statements,carried),writable=reachingTables(statements,restorable);
|
|
35
38
|
const later=unapplied.flatMap(migration=>split(migration).map((sql,index)=>({migration,index,sql,data:dataStatement(sql)})));
|
|
39
|
+
const {admitted,tables:rebuilt}=preservingRebuilds(later,manifest,tables,statements),views=replayViews(statements);
|
|
36
40
|
const known=fold(tables),outside=later.filter(s=>s.data && !writable.includes(s.data.target)),tainted=new Set();
|
|
37
41
|
// Tables an admitted write fills from archived rows (directly, through its
|
|
38
42
|
// target's triggers, or from another such table) hold rows the restore lacks.
|
|
@@ -40,29 +44,33 @@ export function laterData({applied,unapplied,replay,catalogue,archived,empty,tab
|
|
|
40
44
|
for(let grew=true;grew;)grew=outside.filter(s=>s.data.names.some(name=>carried.includes(name) || tainted.has(name))).map(s=>taint(s.data.target)).some(Boolean);
|
|
41
45
|
const refused=new Set(),writes=new Map();
|
|
42
46
|
for(const s of later) {
|
|
43
|
-
if(outside.includes(s))continue;
|
|
47
|
+
if(outside.includes(s) || admitted.has(s))continue;
|
|
44
48
|
s.today=changesData(s.sql,[...reached,...tainted],empty);
|
|
45
49
|
if(s.data && absent.includes(s.data.target)){if(!writes.has(s.data.target))writes.set(s.data.target,[]);writes.get(s.data.target).push(s);}
|
|
46
50
|
else if(s.today)refused.add(s);
|
|
47
51
|
}
|
|
48
52
|
const replays=[];
|
|
49
53
|
for(const [table,list] of writes) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
const
|
|
54
|
+
// Seed INSERTs into a new table replay too: the rows already present in a
|
|
55
|
+
// fresh destination must be reset and derived from the restored installation.
|
|
56
|
+
const bad=list.filter(s=>!replayable(s,{table,statements,restorable,writable,carried,tables:known,secrets,views}));
|
|
57
|
+
// Writes confined to tables created after the archive retain their
|
|
58
|
+
// admission. Replay eligible seeds, but do not turn a new-table-only
|
|
59
|
+
// upgrade into a refused backfill. View reads always require resolution.
|
|
60
|
+
const required=list.some(s=>s.today || s.data.names.some(name=>views.has(name)));
|
|
61
|
+
if(!required && bad.length)continue;
|
|
62
|
+
const reach=reachingTables(statements,[table]),other=later.filter(s=>!admitted.has(s) && !list.includes(s) && writesAnother(s,table,reach,list));
|
|
53
63
|
if(bad.length || other.length){[...bad,...other].forEach(s=>refused.add(s));continue;}
|
|
54
64
|
replays.push(...list);
|
|
55
65
|
}
|
|
56
66
|
const first=later.find(s=>refused.has(s));
|
|
57
67
|
insist(!first,'schema_mismatch:migration_data:'+first?.migration);
|
|
58
68
|
const named=Object.fromEntries(catalogue.map(name=>[folded(name),name]));
|
|
59
|
-
return later.filter(s=>replays.includes(s)).map(s=>({migration:s.migration,statement:s.index,table:named[s.data.target],sql:s.sql}));
|
|
69
|
+
return {rebuilt,replays:later.filter(s=>replays.includes(s)).map(s=>({migration:s.migration,statement:s.index,table:named[s.data.target],sql:s.sql}))};
|
|
60
70
|
}
|
|
61
|
-
function replayable({data},{table,statements,restorable,writable,carried,tables,secrets}) {
|
|
71
|
+
function replayable({data},{table,statements,restorable,writable,carried,tables,secrets,views}) {
|
|
62
72
|
if(!['insert','replace'].includes(data.verb) || data.star)return false;
|
|
63
|
-
|
|
64
|
-
if(!reads.every(name=>carried.includes(name)))return false;
|
|
65
|
-
if(reads.some(name=>Object.entries(secrets).some(([t,columns])=>folded(t)===name && columns.some(c=>data.words.includes(folded(c))))))return false;
|
|
73
|
+
if(!viewReads(data.names,data.words,{views,tables,carried,table,secrets}))return false;
|
|
66
74
|
if(triggerBodies(statements,table).some(name=>writable.includes(name)))return false;
|
|
67
75
|
// Foreign key actions: a row the replay deletes or rekeys (REPLACE, upsert) must reach no other catalogue table.
|
|
68
76
|
return !reachingTables(statements,restorable.filter(name=>name!==table)).includes(table);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { canonicalJson, sha256 } from './hash.mjs';
|
|
2
|
+
import { insist } from './storage.mjs';
|
|
2
3
|
|
|
3
4
|
// Installation authority and transient working state, never product data.
|
|
4
5
|
// Keep exact names except for SQLite/Cloudflare internals and portability's
|
|
5
6
|
// own dynamic copies. Durable erasure receipts and dependency bindings travel.
|
|
6
7
|
export const platformTables=Object.freeze([
|
|
7
|
-
'sqlite_%','_cf_%','d1_migrations','rer_migrations',
|
|
8
|
+
'sqlite_%','_cf_%','d1_migrations','rer_migrations','ik_d1_assertions',
|
|
8
9
|
'_rer_deploy_migrations','_rer_portability_migrations','rer_portability_%',
|
|
9
10
|
'rer_mail_development_outbox','rer_ai_development_outbox',
|
|
10
11
|
'rer_dependency_keys','rer_dependency_pending','rer_dependency_codes',
|
|
@@ -17,6 +18,10 @@ export const platformTable=table=>platformTables.some(pattern=>matches(table,pat
|
|
|
17
18
|
// Compatibility uses the product schema, while the original manifest and parts
|
|
18
19
|
// remain intact for end-to-end archive verification, including skipped rows.
|
|
19
20
|
export async function restorableManifest(manifest) {
|
|
21
|
+
// Successful import-kit units always clear their CHECK guard rows before
|
|
22
|
+
// committing. An old archive may carry the empty table, never its rows.
|
|
23
|
+
for(const table of manifest.tables)if(identifier(table.name)==='ik_d1_assertions')
|
|
24
|
+
insist(table.count===0,'invalid_bookkeeping_rows:'+table.name,409);
|
|
20
25
|
const tables=manifest.tables.filter(table=>!platformTable(table.name));
|
|
21
26
|
if(tables.length===manifest.tables.length)return manifest;
|
|
22
27
|
return {...manifest,tables,schema:await sha256(canonicalJson(tables.map(({name,sql})=>({name,sql})))),
|
|
@@ -3,6 +3,7 @@ import { canonicalJson } from './hash.mjs';
|
|
|
3
3
|
import { tokens, identifier, folded } from './generated.mjs';
|
|
4
4
|
import { laterData } from './backfills.mjs';
|
|
5
5
|
import { destinationLedger } from './ledgers.mjs';
|
|
6
|
+
import { checkRebuild } from './rebuilds.mjs';
|
|
6
7
|
|
|
7
8
|
// Applied product migrations in the ledger's own order (ledgers.mjs). A
|
|
8
9
|
// state-bearing ledger may hold an unacknowledged migration whose effects are
|
|
@@ -51,8 +52,8 @@ async function placement(db,manifest,cat,replay,ledger,history) {
|
|
|
51
52
|
const catalogue=cat.tables.map(t=>t.name),archived=catalogue.filter(name=>manifest.tables.some(t=>t.name===name));
|
|
52
53
|
const empty=archived.filter(name=>!manifest.tables.find(t=>t.name===name).count);
|
|
53
54
|
const tables=(await all(db,"SELECT name FROM sqlite_master WHERE type IN ('table','view')")).map(t=>t.name);
|
|
54
|
-
const replays=laterData({applied,unapplied,replay,catalogue,archived,empty,tables,secrets:manifest.excludedColumns??{}});
|
|
55
|
-
return {earlier,replays};
|
|
55
|
+
const {replays,rebuilt}=laterData({applied,unapplied,replay,catalogue,archived,empty,tables,secrets:manifest.excludedColumns??{},manifest:manifest.tables});
|
|
56
|
+
return {earlier,replays,rebuilt};
|
|
56
57
|
}
|
|
57
58
|
// An archive without a migration record that carries its source's migration
|
|
58
59
|
// ledger (an old archive from before that ledger became bookkeeping) records
|
|
@@ -84,20 +85,22 @@ export async function sameSchemaMigrations(db,manifest,cat,migrations,history) {
|
|
|
84
85
|
await placement(db,manifest,cat,await migrations(),ledger,history);
|
|
85
86
|
}
|
|
86
87
|
// An archive made before later migrations restores only when those migrations
|
|
87
|
-
// are additive
|
|
88
|
-
//
|
|
88
|
+
// are additive, or a proven row-preserving CHECK rebuild: new tables, new
|
|
89
|
+
// columns that take a default, or indexes (which archives never carry).
|
|
90
|
+
// Anything else stays a schema_mismatch refusal.
|
|
89
91
|
export async function additiveBridge(db,manifest,cat,migrations,history) {
|
|
90
92
|
insist(migrations,'schema_mismatch');
|
|
91
93
|
const replay=await migrations(),ledger=await destinationLedger(db)??[],applied=ledger.map(m=>m.name);
|
|
92
94
|
insist(!manifest.migrations || manifest.migrations.every(name=>applied.includes(name)),'schema_mismatch:migrations');
|
|
93
|
-
const {earlier,replays}=await placement(db,manifest,cat,replay,ledger,history);
|
|
95
|
+
const {earlier,replays,rebuilt}=await placement(db,manifest,cat,replay,ledger,history);
|
|
94
96
|
const columns={};
|
|
95
97
|
for(const table of manifest.tables) {
|
|
96
98
|
const target=cat.tables.find(t=>t.name===table.name),label=':'+table.name;
|
|
97
99
|
insist(target,'schema_mismatch:table'+label);
|
|
98
100
|
const kept=target.columns.slice(0,table.columns.length),added=target.columns.slice(table.columns.length);
|
|
99
101
|
insist(canonicalJson(kept)===canonicalJson(table.columns) && table.rowidAlias===target.rowidAlias && table.dependencies.every(d=>target.dependencies.includes(d)),'schema_mismatch:columns'+label);
|
|
100
|
-
|
|
102
|
+
const rebuiltChecks=rebuilt.has(folded(table.name)) && checkRebuild(table.sql,target.sql);
|
|
103
|
+
if(!added.length){insist(table.sql===target.sql || rebuiltChecks,'schema_mismatch:definition'+label);continue;}
|
|
101
104
|
const declared=await all(db,`PRAGMA table_xinfo(${quote(table.name)})`);
|
|
102
105
|
insist(added.every(c=>!c.pk && !c.generated && (!c.notnull || declared.find(d=>d.name===c.name)?.dflt_value!=null)),'schema_mismatch:column_default'+label);
|
|
103
106
|
insist(appended(table.sql,target.sql,added.map(c=>c.name)),'schema_mismatch:definition'+label);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { all, statement, state, guard, job, save, partQueries, parts, readPart,
|
|
1
|
+
import { all, statement, state, guard, job, save, partQueries, parts, readPart, dropCopyStatements, cleanCopyStatements, quote, stream, insist, run } from './storage.mjs';
|
|
2
2
|
import { stagePart } from './import-staging.mjs';
|
|
3
3
|
import { normalizeStaged } from './import-safety.mjs';
|
|
4
4
|
import { ensureImportLeases, createImportLease, importLeaseStatus, importRunning, withImportLease } from './import-lease.mjs';
|
|
@@ -183,7 +183,7 @@ async function finalizeLeasedImport(context,id,{contentHash,archiveHash,laterJou
|
|
|
183
183
|
await normalizeStaged(context,row);
|
|
184
184
|
await refusePolicyApprovals(db,row.metadata.copies);
|
|
185
185
|
if(config.validateStaged) {
|
|
186
|
-
const read=async table=>{insist(row.metadata.copies[table],'staged_table');const target=row.metadata.targets.find(t=>t.name===table);return (await readCopy(db,target,row.metadata.copies[table],0,row.metadata.manifest.tables.find(t=>t.name===table)?.count??0)).map(x=>x.row);};
|
|
186
|
+
const read=async table=>{insist(row.metadata.copies[table],'staged_table:'+table);const target=row.metadata.targets.find(t=>t.name===table);return (await readCopy(db,target,row.metadata.copies[table],0,row.metadata.manifest.tables.find(t=>t.name===table)?.count??0)).map(x=>x.row);};
|
|
187
187
|
insist(await config.validateStaged({db,tables:{...row.metadata.copies},read,manifest})!==false,'staged_validation');
|
|
188
188
|
}
|
|
189
189
|
row.phase='applying';
|
|
@@ -207,6 +207,9 @@ async function finalizeLeasedImport(context,id,{contentHash,archiveHash,laterJou
|
|
|
207
207
|
...replaced.map(t=>db.prepare(`DELETE FROM ${quote(t)}`)),
|
|
208
208
|
...row.metadata.targets.flatMap(t=>restoreCopy(db,t,row.metadata.copies[t.name])),save(db,row),...replayStatements(db,row),
|
|
209
209
|
...row.metadata.triggers.map(t=>db.prepare(t.sql)),...mergeJournal(db,manifest,checked),...legacyAuditStatements(db,row),
|
|
210
|
+
// Publication and removal of this import's scratch commit together. A lost
|
|
211
|
+
// acknowledgement still finds a complete job with no staging left behind.
|
|
212
|
+
...dropCopyStatements(db,row),
|
|
210
213
|
db.prepare('UPDATE rer_portability_state SET import_job=NULL,applying=0 WHERE id=1'),db.prepare('DELETE FROM rer_portability_guard')]);
|
|
211
214
|
}catch(e){
|
|
212
215
|
// D1 may have committed even when its acknowledgement failed.
|
|
@@ -232,8 +235,8 @@ export async function abortImport(context,id,options={}) {
|
|
|
232
235
|
}
|
|
233
236
|
async function abortLeasedImport(context,row) {
|
|
234
237
|
const id=row.id;
|
|
235
|
-
await removeOwned(context,id);
|
|
236
|
-
await context.db.batch([save(context.db,row),statement(context.db,'UPDATE rer_portability_state SET import_job=NULL,applying=0 WHERE id=1 AND import_job=?',id)]);
|
|
238
|
+
await removeOwned(context,id);row.phase='aborted';
|
|
239
|
+
await context.db.batch([...cleanCopyStatements(context.db,row),save(context.db,row),statement(context.db,'UPDATE rer_portability_state SET import_job=NULL,applying=0 WHERE id=1 AND import_job=?',id)]);
|
|
237
240
|
return importStatus(context,id);
|
|
238
241
|
}
|
|
239
242
|
// A restore's staging outlives a worker that died mid-restore (a crashed process or workerd) and refuses
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { splitStatements } from './sql-text.mjs';
|
|
2
|
+
|
|
3
|
+
// Use the installation's migration runner to reproduce the text it stores in
|
|
4
|
+
// sqlite_master (including its comment handling). Then recover SQLite's own
|
|
5
|
+
// boundaries: Wrangler can glue a CASE ... END trigger to later statements.
|
|
6
|
+
export function migrationStatements(sql, runnerSplit) {
|
|
7
|
+
return runnerSplit(sql).flatMap(splitStatements);
|
|
8
|
+
}
|
|
@@ -16,8 +16,8 @@ import { tableNames, splitStatements } from './sql-text.mjs';
|
|
|
16
16
|
// operator-auth or other excluded tables that no trigger links to restorable ones.
|
|
17
17
|
// `empty` lists the restorable tables the archive holds no rows of: restore
|
|
18
18
|
// leaves them empty, and an UPDATE or DELETE of an empty table changes nothing
|
|
19
|
-
// (no row fires a trigger either),
|
|
20
|
-
//
|
|
19
|
+
// (no row fires a trigger either), regardless of the tables it reads. This
|
|
20
|
+
// exemption requires a bounded data statement whose target can be read.
|
|
21
21
|
// Any other statement naming an empty table still does: an INSERT would leave
|
|
22
22
|
// rows the restore lacks. A chunk holding several statements (sql-text.mjs
|
|
23
23
|
// splitStatements) changes data when any of them does.
|
|
@@ -27,28 +27,30 @@ export function changesData(sql,reached,empty=[]) {
|
|
|
27
27
|
function statementChanges(sql,reached,empty) {
|
|
28
28
|
const list=tokens(sql),words=list.map(t=>t.quoted?undefined:folded(t.text)),kind=kindOf(words);
|
|
29
29
|
if(kind==='create table')return topLevelWords(list,words).includes('as');
|
|
30
|
-
if(
|
|
30
|
+
if(['create index','create view','drop view'].includes(kind))return false;
|
|
31
31
|
if(kind==='alter table' && words.find((w,i)=>i>2 && ['add','rename','drop'].includes(w))==='add')return false;
|
|
32
32
|
if(kind==='create trigger' && createdTrigger(list))return false;
|
|
33
33
|
if(kind==='drop trigger' && droppedTrigger(list))return false;
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const data=dataStatement(sql);
|
|
35
|
+
if(data && ['update','delete'].includes(data.verb) && empty.map(folded).includes(data.target))return false;
|
|
36
|
+
return names(list,new Set(reached.map(folded)));
|
|
36
37
|
}
|
|
37
38
|
// The restorable tables and every table whose writes reach one through a
|
|
38
39
|
// trigger any of `statements` creates, or through a foreign key action (ON
|
|
39
40
|
// DELETE/UPDATE CASCADE or SET) declared by a reached table: a write to such a
|
|
40
41
|
// table during a later migration changes restorable rows the archive lacks. A
|
|
41
|
-
// trigger counts when its statement names a reached
|
|
42
|
-
//
|
|
43
|
-
//
|
|
42
|
+
// bounded trigger with a writing body counts when its statement names a reached
|
|
43
|
+
// table anywhere; a read-only body (including SELECT RAISE) writes nothing.
|
|
44
|
+
// One this parser cannot bound adds every table name it holds (sql-text.mjs
|
|
45
|
+
// tableNames: never a keyword, function, qualified column or literal).
|
|
44
46
|
export function reachingTables(statements,restorable) {
|
|
45
47
|
const reached=new Set(restorable.map(folded)),parsed=statements.flatMap(splitStatements).map(sql=>tokens(sql)).map(list=>({list,words:list.map(t=>t.quoted?undefined:folded(t.text))}));
|
|
46
|
-
const triggers=parsed.filter(({words})=>kindOf(words)==='create trigger').map(({list})=>({list,
|
|
48
|
+
const triggers=parsed.filter(({words})=>kindOf(words)==='create trigger').map(({list})=>({list,created:createdTrigger(list)})).filter(({created})=>!created || created.writes);
|
|
47
49
|
const actions=parsed.filter(({words})=>['create table','alter table'].includes(kindOf(words)) && words.some((w,i)=>w==='cascade' || (w==='set' && ['delete','update'].includes(words[i-1])))).map(({list})=>referencing(list));
|
|
48
50
|
for(let grew=true;grew;) {
|
|
49
51
|
grew=false;
|
|
50
52
|
const add=name=>{if(!reached.has(name)){reached.add(name);grew=true;}};
|
|
51
|
-
for(const {list,
|
|
53
|
+
for(const {list,created} of triggers)if(names(list,reached))(created===undefined?tableNames(list):[created.on]).forEach(add);
|
|
52
54
|
for(const {table,parents} of actions)if(table===undefined?parents.some(name=>reached.has(name)):reached.has(table))parents.forEach(add);
|
|
53
55
|
}
|
|
54
56
|
return [...reached];
|
|
@@ -115,7 +117,7 @@ function closing(parts,start) {
|
|
|
115
117
|
for(let i=start;i<parts.length;i++){if(parts[i].quoted)continue;if(parts[i].text==='(')depth++;else if(parts[i].text===')' && !--depth)return i+1;}
|
|
116
118
|
return parts.length;
|
|
117
119
|
}
|
|
118
|
-
// The table names in
|
|
120
|
+
// The table names in writing bodies of triggers on `table` that `statements`
|
|
119
121
|
// create, and every one in a trigger this parser cannot bound that names the table.
|
|
120
122
|
export function triggerBodies(statements,table) {
|
|
121
123
|
const result=[];
|
|
@@ -123,7 +125,7 @@ export function triggerBodies(statements,table) {
|
|
|
123
125
|
if(kindOf(list.map(t=>t.quoted?undefined:folded(t.text)))!=='create trigger')continue;
|
|
124
126
|
const created=createdTrigger(list);
|
|
125
127
|
if(!created){if(tableNames(list).includes(table))result.push(...tableNames(list));}
|
|
126
|
-
else if(created.on===table)result.push(...tableNames(atoms(list).slice(created.begin+1)));
|
|
128
|
+
else if(created.on===table && created.writes)result.push(...tableNames(atoms(list).slice(created.begin+1)));
|
|
127
129
|
}
|
|
128
130
|
return result;
|
|
129
131
|
}
|
|
@@ -149,9 +151,11 @@ function atoms(list) {
|
|
|
149
151
|
}
|
|
150
152
|
const semicolon=a=>!a.quoted && a.text===';';
|
|
151
153
|
const word=(a,value)=>a && !a.quoted && folded(a.text)===value;
|
|
152
|
-
// {on} for CREATE [TEMP] TRIGGER ... ON table ... BEGIN statement;
|
|
153
|
-
// nothing after it.
|
|
154
|
-
//
|
|
154
|
+
// {on,begin,writes} for CREATE [TEMP] TRIGGER ... ON table ... BEGIN statement;
|
|
155
|
+
// ... END and nothing after it. Only body DML counts as writing; WHEN reads
|
|
156
|
+
// and the header's INSERT/UPDATE/DELETE event do not. The body ends at the first
|
|
157
|
+
// END that starts a statement; CASE ... END inside a statement does not.
|
|
158
|
+
// Anything else is unbounded.
|
|
155
159
|
function createdTrigger(list) {
|
|
156
160
|
const parts=atoms(list);let depth=0,begin=-1,on;
|
|
157
161
|
for(let i=0;i<parts.length && begin<0;i++) {
|
|
@@ -170,11 +174,12 @@ function createdTrigger(list) {
|
|
|
170
174
|
}else if(!depth && word(a,'begin'))begin=i;
|
|
171
175
|
}
|
|
172
176
|
if(begin<0 || on===undefined)return;
|
|
173
|
-
let start=true,statements=0;
|
|
177
|
+
let start=true,statements=0,writes=false;
|
|
174
178
|
for(let i=begin+1;i<parts.length;i++) {
|
|
175
179
|
const a=parts[i];
|
|
176
|
-
if(start && word(a,'end'))return i===parts.length-1 && statements && !depth?{on,begin}:undefined;
|
|
180
|
+
if(start && word(a,'end'))return i===parts.length-1 && statements && !depth?{on,begin,writes}:undefined;
|
|
177
181
|
if(semicolon(a)){if(start || depth)return;start=true;statements++;continue;}
|
|
182
|
+
if(['insert','replace','update','delete'].some(verb=>word(a,verb)))writes=true;
|
|
178
183
|
if(!a.quoted){if(a.text==='(')depth++;else if(a.text===')' && --depth<0)return;}
|
|
179
184
|
start=false;
|
|
180
185
|
}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { tokens, identifier, folded } from './generated.mjs';
|
|
2
|
+
import { statementNames, reachingTables } from './migration-statements.mjs';
|
|
3
|
+
|
|
4
|
+
const word=(t,w)=>t && !t.quoted && folded(t.text)===w;
|
|
5
|
+
const name=t=>t && (t.quoted?t.text[0]!=="'":/^[A-Za-z_\u0080-\uffff][\w$\u0080-\uffff]*$/.test(t.text))?folded(identifier(t)):undefined;
|
|
6
|
+
const same=(a,b)=>JSON.stringify(a)===JSON.stringify(b);
|
|
7
|
+
const lex=sql=>tokens(sql);
|
|
8
|
+
function groups(list) {
|
|
9
|
+
const result=[[]];let depth=0;
|
|
10
|
+
for(const t of list) {
|
|
11
|
+
if(t.text==='(')depth++;
|
|
12
|
+
if(t.text===')')depth--;
|
|
13
|
+
if(t.text===',' && !depth)result.push([]);else result.at(-1).push(t);
|
|
14
|
+
}
|
|
15
|
+
return result;
|
|
16
|
+
}
|
|
17
|
+
// A definition may change CHECKs, while every column declaration, other
|
|
18
|
+
// constraint, collation, default, generated expression and table option stays.
|
|
19
|
+
export function checkRebuild(before,after) {
|
|
20
|
+
const shape=sql=>{
|
|
21
|
+
const list=lex(sql),open=list.findIndex(t=>t.text==='(');let depth=0,close=-1;
|
|
22
|
+
for(let i=open;i<list.length;i++){if(list[i].text==='(')depth++;if(list[i].text===')' && !--depth){close=i;break;}}
|
|
23
|
+
if(open<0 || close<0)return;
|
|
24
|
+
const declarations=groups(list.slice(open+1,close)).map(part=>{
|
|
25
|
+
const kept=[];
|
|
26
|
+
for(let i=0;i<part.length;i++) {
|
|
27
|
+
if(word(part[i],'constraint') && word(part[i+2],'check')){i+=2;}
|
|
28
|
+
if(word(part[i],'check') && part[i+1]?.text==='(') {
|
|
29
|
+
let d=0;i++;
|
|
30
|
+
do {if(part[i].text==='(')d++;if(part[i].text===')')d--;i++;}while(i<part.length && d);
|
|
31
|
+
if(d)return ['unbounded'];
|
|
32
|
+
i--;continue;
|
|
33
|
+
}
|
|
34
|
+
kept.push(part[i]);
|
|
35
|
+
}
|
|
36
|
+
return kept;
|
|
37
|
+
}).filter(part=>part.length);
|
|
38
|
+
return [...declarations.map(part=>part.map(normal)),list.slice(close+1).map(normal)];
|
|
39
|
+
};
|
|
40
|
+
const a=shape(before),b=shape(after);
|
|
41
|
+
return a!==undefined && b!==undefined && same(a,b);
|
|
42
|
+
}
|
|
43
|
+
const normal=t=>t.quoted?(t.text[0]==="'"?t.text:folded(identifier(t))):folded(t.text);
|
|
44
|
+
function declaration(sql) {
|
|
45
|
+
const list=lex(sql);
|
|
46
|
+
if(!word(list[0],'create') || !word(list[1],'table') || !name(list[2]) || list[3]?.text!=='(')return;
|
|
47
|
+
let depth=0,close=-1;
|
|
48
|
+
for(let i=3;i<list.length;i++){if(list[i].text==='(')depth++;if(list[i].text===')' && !--depth){close=i;break;}}
|
|
49
|
+
if(close<0)return;
|
|
50
|
+
const columns=groups(list.slice(4,close)).filter(p=>!['constraint','primary','unique','check','foreign'].some(w=>word(p[0],w))).map(p=>name(p[0]));
|
|
51
|
+
if(columns.some(c=>!c))return;
|
|
52
|
+
return {name:name(list[2]),columns};
|
|
53
|
+
}
|
|
54
|
+
function select(list,columns) {
|
|
55
|
+
if(!word(list[0],'select'))return;
|
|
56
|
+
const from=list.findIndex(t=>word(t,'from'));
|
|
57
|
+
if(from<0 || from!==list.length-2 || !name(list.at(-1)))return;
|
|
58
|
+
const projection=groups(list.slice(1,from)).flatMap(part=>part.length===1 && part[0].text==='*'?columns.map(c=>({source:c,name:c})):
|
|
59
|
+
part.length===1 && name(part[0])?[{source:name(part[0]),name:name(part[0])}]:
|
|
60
|
+
part.length===3 && word(part[1],'as') && name(part[0]) && name(part[2])?[{source:name(part[0]),name:name(part[2])}]:[{source:undefined}]);
|
|
61
|
+
if(projection.some(p=>!p.source))return;
|
|
62
|
+
return {table:name(list.at(-1)),projection};
|
|
63
|
+
}
|
|
64
|
+
const drop=(sql,table)=>{const t=lex(sql);return t.length===3 && word(t[0],'drop') && word(t[1],'table') && name(t[2])===table;};
|
|
65
|
+
function copied(block,table) {
|
|
66
|
+
const [copy,removed,created,insert,cleaned]=block.map(s=>s.sql),head=lex(copy),target=declaration(created);
|
|
67
|
+
if(!target || target.name!==folded(table.name) || !word(head[0],'create') || !word(head[1],'table') || !name(head[2]) || !word(head[3],'as'))return;
|
|
68
|
+
const temporary=name(head[2]),saved=select(head.slice(4),target.columns);
|
|
69
|
+
if(!saved || saved.table!==target.name || temporary===target.name || !drop(removed,target.name) || !drop(cleaned,temporary))return;
|
|
70
|
+
const put=lex(insert);
|
|
71
|
+
if(!word(put[0],'insert') || !word(put[1],'into') || name(put[2])!==target.name)return;
|
|
72
|
+
let at=3,columns=target.columns;
|
|
73
|
+
if(put[at]?.text==='('){const end=put.findIndex((t,i)=>i>at && t.text===')');if(end<0)return;columns=groups(put.slice(at+1,end)).map(p=>p.length===1?name(p[0]):undefined);at=end+1;}
|
|
74
|
+
const restored=select(put.slice(at),saved.projection.map(p=>p.name));
|
|
75
|
+
if(!restored || restored.table!==temporary || restored.projection.length!==columns.length || new Set(columns).size!==columns.length)return;
|
|
76
|
+
const mapping=columns.map((column,i)=>({column,source:saved.projection.find(p=>p.name===restored.projection[i].source)?.source}));
|
|
77
|
+
if(!target.columns.every(c=>mapping.some(m=>m.column===c && m.source===c)))return;
|
|
78
|
+
if(!table.columns.every(c=>target.columns.includes(folded(c.name))) || table.columns.some(c=>c.generated))return;
|
|
79
|
+
// A populated archive requires an explicit rowid round trip, even for a
|
|
80
|
+
// table whose declared key makes its rowid incidental to archive identity.
|
|
81
|
+
if(table.count && !mapping.some(m=>['rowid','_rowid_','oid'].includes(m.column) && ['rowid','_rowid_','oid'].includes(m.source) && !target.columns.includes(m.column) && !target.columns.includes(m.source)))return;
|
|
82
|
+
if(mapping.some(m=>!m.source || (!target.columns.includes(m.column) && !['rowid','_rowid_','oid'].includes(m.column))))return;
|
|
83
|
+
return temporary;
|
|
84
|
+
}
|
|
85
|
+
// Admit only a complete, local copy/drop/create/copy-back/drop sequence. The
|
|
86
|
+
// manifest supplies counts; no restored rows are scanned to classify SQL.
|
|
87
|
+
// Statements outside the block still face the normal data classifier.
|
|
88
|
+
export function preservingRebuilds(later,manifest,known,statements) {
|
|
89
|
+
const admitted=new Set(),tables=new Set();
|
|
90
|
+
for(let i=0;i+4<later.length;i++) {
|
|
91
|
+
const block=later.slice(i,i+5);
|
|
92
|
+
if(block.some(s=>s.migration!==block[0].migration))continue;
|
|
93
|
+
const table=manifest.find(t=>folded(t.name)===declaration(block[2].sql)?.name);
|
|
94
|
+
if(!table)continue;
|
|
95
|
+
const temporary=copied(block,table);
|
|
96
|
+
if(!temporary || known.map(folded).includes(temporary))continue;
|
|
97
|
+
if(later.some(s=>!block.includes(s) && statementNames(s.sql).includes(temporary)))continue;
|
|
98
|
+
const foreignKeys=statements.filter(sql=>{const t=lex(sql);return (word(t[0],'create') || word(t[0],'alter')) && word(t[1],'table');});
|
|
99
|
+
if(table.count && reachingTables(foreignKeys,manifest.filter(t=>t!==table).map(t=>t.name)).includes(folded(table.name)))continue;
|
|
100
|
+
// CHECK-only changes are verified against the archived definition too;
|
|
101
|
+
// dropping/changing a column never earns a definition exemption.
|
|
102
|
+
if(!checkRebuild(table.sql,block[2].sql))continue;
|
|
103
|
+
block.forEach(s=>admitted.add(s));tables.add(folded(table.name));i+=4;
|
|
104
|
+
}
|
|
105
|
+
return {admitted,tables};
|
|
106
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { tokens, identifier, folded } from './generated.mjs';
|
|
2
|
+
import { statementNames, dataStatement } from './migration-statements.mjs';
|
|
3
|
+
|
|
4
|
+
// Resolve the latest view definitions in the applied history, rather than
|
|
5
|
+
// trusting an independently edited sqlite_master view. Nested views resolve
|
|
6
|
+
// recursively; cycles and reads of non-carried tables refuse replay.
|
|
7
|
+
export function replayViews(statements) {
|
|
8
|
+
const views=new Map();
|
|
9
|
+
for(const sql of statements) {
|
|
10
|
+
const list=tokens(sql),words=list.map(t=>t.quoted?undefined:folded(t.text));
|
|
11
|
+
if(!['create','drop'].includes(words[0]) || words[1]!=='view')continue;
|
|
12
|
+
const at=words[2]==='if'?(words[0]==='create'?5:4):2,name=folded(identifier(list[at]));
|
|
13
|
+
if(words[0]==='drop'){views.delete(name);continue;}
|
|
14
|
+
const as=list.findIndex((t,i)=>i>at && !t.quoted && folded(t.text)==='as');
|
|
15
|
+
if(as<0){views.set(name,undefined);continue;}
|
|
16
|
+
const body=sql.slice(list[as].end),data=dataStatement('INSERT INTO rer_view_probe '+body);
|
|
17
|
+
views.set(name,{names:statementNames(body),words:data?.words??[],star:data?.star});
|
|
18
|
+
}
|
|
19
|
+
return views;
|
|
20
|
+
}
|
|
21
|
+
export function viewReads(names,words,{views,tables,carried,table,secrets},seen=new Set()) {
|
|
22
|
+
const reads=[];
|
|
23
|
+
for(const name of names.filter(n=>tables.includes(n) && n!==table)) {
|
|
24
|
+
if(!views.has(name)){if(!carried.includes(name))return false;reads.push(name);continue;}
|
|
25
|
+
const view=views.get(name);
|
|
26
|
+
if(!view || seen.has(name))return false;
|
|
27
|
+
const nested=viewReads(view.names,[...words,...view.words],{views,tables,carried,table,secrets},new Set([...seen,name]));
|
|
28
|
+
if(!nested)return false;
|
|
29
|
+
// A wildcard could expose a secret column through a renamed view output.
|
|
30
|
+
if(view.star && nested.some(n=>Object.entries(secrets).some(([t,columns])=>folded(t)===n && columns.length)))return false;
|
|
31
|
+
reads.push(...nested);
|
|
32
|
+
}
|
|
33
|
+
if(reads.some(name=>Object.entries(secrets).some(([t,columns])=>folded(t)===name && columns.some(c=>words.includes(folded(c))))))return false;
|
|
34
|
+
return reads;
|
|
35
|
+
}
|
|
@@ -53,7 +53,14 @@ export function stream(generator) {
|
|
|
53
53
|
return new ReadableStream({async pull(controller){try{const next=await iterator.next();if(next.done)controller.close();else controller.enqueue(next.value);}catch(e){controller.error(e);}},async cancel(){await iterator.return?.();}});
|
|
54
54
|
}
|
|
55
55
|
export function transferTables(row) { return Object.values(row.metadata.copies??{}).flatMap(name=>[name,name+'_meta']); }
|
|
56
|
+
export function dropCopyStatements(db,row) {
|
|
57
|
+
// Exact names recorded when this job created its copies, never a prefix sweep.
|
|
58
|
+
return transferTables(row).map(name=>db.prepare(`DROP TABLE IF EXISTS ${quote(name)}`));
|
|
59
|
+
}
|
|
60
|
+
export function cleanCopyStatements(db,row) {
|
|
61
|
+
return [...dropCopyStatements(db,row),statement(db,'DELETE FROM rer_portability_parts WHERE job=?',row.id),
|
|
62
|
+
statement(db,'DELETE FROM rer_portability_segments WHERE job=?',row.id)];
|
|
63
|
+
}
|
|
56
64
|
export async function cleanCopies(db,row) {
|
|
57
|
-
await db.batch(
|
|
58
|
-
statement(db,'DELETE FROM rer_portability_parts WHERE job=?',row.id),statement(db,'DELETE FROM rer_portability_segments WHERE job=?',row.id)]);
|
|
65
|
+
await db.batch(cleanCopyStatements(db,row));
|
|
59
66
|
}
|
|
@@ -12,11 +12,13 @@ import { releasePublicBase } from './public-base.mjs';
|
|
|
12
12
|
import { prepareTagAdoption, confirmTagAdoption, assertTagAdoption } from './tag-adoption.mjs';
|
|
13
13
|
import { placeholderMarks, placeholderMessage } from '../../cli/placeholder-mark.mjs';
|
|
14
14
|
import { cleanupTemporary } from './cleanup.mjs';
|
|
15
|
+
import { parseTimeoutSeconds } from '../../scripts/publish-check/timeout.mjs';
|
|
15
16
|
|
|
16
17
|
// Failure output belongs to the private receipt, not the site preview.
|
|
17
18
|
const withoutOutput = gates => JSON.parse(JSON.stringify(gates, (key, value) => key === 'output' ? undefined : value));
|
|
18
19
|
|
|
19
|
-
export async function release({ repo, ref = 'HEAD', output, project, repository, dryRun = false, tag = false, cleanHistory: clean = false, envFile, onto, publicBase, localVerify = false, allowPlaceholderMark = false, verifyWorkflow }) {
|
|
20
|
+
export async function release({ repo, ref = 'HEAD', output, project, repository, dryRun = false, tag = false, cleanHistory: clean = false, envFile, onto, publicBase, localVerify = false, allowPlaceholderMark = false, verifyWorkflow, scanTimeoutSeconds }) {
|
|
21
|
+
if (scanTimeoutSeconds !== undefined) scanTimeoutSeconds = parseTimeoutSeconds(scanTimeoutSeconds, { integer: true });
|
|
20
22
|
if (!/^[\w.-]+\/[\w.-]+$/.test(project ?? '')) throw Error('--project must be publisher/name');
|
|
21
23
|
if (!/^https:\/\/github\.com\/[\w.-]+\/[\w.-]+(?:\.git)?$/i.test(repository ?? '')) throw Error('--repository must be a credential-free GitHub repository URL');
|
|
22
24
|
if (onto !== undefined && clean) throw Error('--onto and --clean-history are mutually exclusive');
|
|
@@ -60,8 +62,8 @@ export async function release({ repo, ref = 'HEAD', output, project, repository,
|
|
|
60
62
|
const exported = destination ? publicChild(source, temporary, destination, publicParent, Boolean(tag))
|
|
61
63
|
: clean ? cleanHistory(source, temporary, Boolean(tag)) : null;
|
|
62
64
|
let report = exported
|
|
63
|
-
? publicationScan(exported.repo, exported.commit, envFile, project, repository, scanBase)
|
|
64
|
-
: sourcePublicationScan(source, temporary, envFile, project, repository, scanBase, Boolean(tag), adopted);
|
|
65
|
+
? publicationScan(exported.repo, exported.commit, envFile, project, repository, scanBase, undefined, scanTimeoutSeconds)
|
|
66
|
+
: sourcePublicationScan(source, temporary, envFile, project, repository, scanBase, Boolean(tag), adopted, scanTimeoutSeconds);
|
|
65
67
|
if (destination) {
|
|
66
68
|
assertPublicTree(exported.repo, exported.commit, source.tree);
|
|
67
69
|
if (report.status === 'PASS' && (report.complete !== true || report.guarantees?.historyScanned !== true ||
|