@quereus/quereus 2.8.0 → 3.0.0

package/dist/src/runtime/delta-executor.js

@@ -0,0 +1,382 @@
+/**
+ * Delta executor kernel.
+ *
+ * A reusable dispatcher that any change-driven consumer (assertions today;
+ * materialized views, reactive signals, triggers tomorrow) can register
+ * subscriptions against. The kernel inspects per-subscription bindings
+ * (`BindingMode`), collects the relevant changed binding tuples from the
+ * TransactionManager's change capture, applies a cost-based fallback to
+ * global re-evaluation when too many tuples would need per-binding dispatch,
+ * and invokes the subscription's `apply` once with the resulting batches.
+ *
+ * The kernel itself is stateless across runs; subscriptions own their own
+ * residual plan cache (no shared cache, since plan-shape generation is
+ * consumer-specific).
+ */
+import { createLogger } from '../common/logger.js';
+import { QuereusError } from '../common/errors.js';
+import { StatusCode } from '../common/types.js';
+const log = createLogger('runtime:delta-executor');
+/**
+ * Coordinates delta dispatch across all registered subscriptions.
+ */
+export class DeltaExecutor {
+    ctx;
+    subscriptions = new Set();
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    /**
+     * Register a subscription. Returns a dispose handle that removes the
+     * subscription and calls its `dispose()`.
+     */
+    register(sub) {
+        this.subscriptions.add(sub);
+        let disposed = false;
+        return () => {
+            if (disposed)
+                return;
+            disposed = true;
+            this.subscriptions.delete(sub);
+            sub.dispose();
+        };
+    }
+    /** Dispose all subscriptions. */
+    disposeAll() {
+        for (const sub of this.subscriptions) {
+            sub.dispose();
+        }
+        this.subscriptions.clear();
+    }
+    /**
+     * Run all impacted subscriptions. Throws on the first subscription's
+     * `apply` rejection — exceptions are surfaced unchanged so the COMMIT
+     * path can roll back.
+     */
+    async runAll() {
+        if (this.subscriptions.size === 0)
+            return;
+        const changedBases = this.ctx.getChangedBaseTables();
+        if (changedBases.size === 0)
+            return;
+        // Snapshot subscriptions before iterating: a handler that registers a
+        // new subscription mid-fire must not see the current commit, and one
+        // that unsubscribes a peer must still see in-flight apply complete.
+        const snapshot = [...this.subscriptions];
+        for (const sub of snapshot) {
+            if (!this.subscriptions.has(sub))
+                continue;
+            await this.runOne(sub, changedBases);
+        }
+    }
+    async runOne(sub, changedBases) {
+        // Quick skip: if no dependency of the subscription changed at all.
+        let any = false;
+        for (const dep of sub.dependencies) {
+            if (changedBases.has(dep)) {
+                any = true;
+                break;
+            }
+        }
+        if (!any)
+            return;
+        const perRelationTuples = new Map();
+        const globalRelations = new Set();
+        for (const [relKey, binding] of sub.bindings) {
+            const base = sub.relationToBase.get(relKey);
+            if (!base || !changedBases.has(base))
+                continue;
+            if (binding.kind === 'global') {
+                globalRelations.add(relKey);
+                continue;
+            }
+            const cols = binding.kind === 'row' ? binding.keyColumns : binding.groupColumns;
+            const pkIndices = sub.pkIndicesByBase.get(base);
+            if (!pkIndices) {
+                // No PK known for this base — can't fetch tuples; fall back to global.
+                log('No PK for base %s; falling back to global for %s', base, sub.id);
+                globalRelations.add(relKey);
+                continue;
+            }
+            let tuples;
+            try {
+                tuples = this.ctx.getChangedTuples(base, cols, pkIndices);
+            }
+            catch (e) {
+                // The requested columns aren't registered. Fall back to global
+                // for safety — the subscription forgot to register a CaptureSpec.
+                log('getChangedTuples failed for %s on %s (%s); falling back to global', sub.id, base, e.message);
+                globalRelations.add(relKey);
+                continue;
+            }
+            if (tuples.length === 0) {
+                // Dependency changed but no captured tuples touched this binding —
+                // nothing to dispatch for this relation.
+                continue;
+            }
+            // Cost fallback: if the number of distinct binding tuples is a large
+            // fraction of the base table size, doing N per-binding runs is likely
+            // worse than one global run.
+            const rowCount = this.ctx.getRowCount?.(base);
+            if (rowCount !== undefined && rowCount > 0) {
+                const ratio = tuples.length / rowCount;
+                if (ratio >= this.ctx.deltaPerRowFallbackRatio) {
+                    log('Cost fallback for %s on %s: %d/%d ≥ %s — running global', sub.id, base, tuples.length, rowCount, this.ctx.deltaPerRowFallbackRatio);
+                    globalRelations.add(relKey);
+                    continue;
+                }
+            }
+            perRelationTuples.set(relKey, tuples);
+        }
+        if (perRelationTuples.size === 0 && globalRelations.size === 0) {
+            return;
+        }
+        const input = { perRelationTuples, globalRelations };
+        await sub.apply(input);
+    }
+}
+/** Synthetic relation key for the i-th watch in a scope. */
+function relKeyForWatch(table, watchIndex) {
+    return `${baseKeyFor(table)}#watch_${watchIndex}`;
+}
+function baseKeyFor(table) {
+    // Defensive: the contract on `QualifiedName` says lowercased, but
+    // hand-built `ChangeScope` values may not honor it. The change log is
+    // keyed lowercased, so non-lowercased deps would never match.
+    return `${table.schema}.${table.table}`.toLowerCase();
+}
+/**
+ * Stable string key for an SqlValue tuple, used to intersect kernel-emitted
+ * tuples against a watch's literal `values`.
+ */
+function tupleKey(tuple) {
+    const parts = [];
+    for (const v of tuple) {
+        if (v === null)
+            parts.push('null');
+        else if (typeof v === 'bigint')
+            parts.push(`b:${v.toString()}`);
+        else if (typeof v === 'number')
+            parts.push(`n:${v}`);
+        else if (typeof v === 'string')
+            parts.push(`s:${v}`);
+        else if (typeof v === 'boolean')
+            parts.push(`B:${v}`);
+        else if (v instanceof Uint8Array)
+            parts.push(`x:${Array.from(v).map(b => b.toString(16).padStart(2, '0')).join('')}`);
+        else
+            parts.push(`j:${JSON.stringify(v)}`);
+    }
+    return parts.join('|');
+}
+/**
+ * Resolve a column name on a base table or throw a clear error.
+ */
+function resolveColumn(qname, info, name) {
+    const idx = info.columnIndexMap.get(name.toLowerCase());
+    if (idx === undefined) {
+        throw new QuereusError(`watch: column '${name}' does not exist on ${qname.schema}.${qname.table}`, StatusCode.ERROR);
+    }
+    return idx;
+}
+/**
+ * Translate a public `ChangeScope` into a `DeltaSubscription` plus its
+ * capture-spec dispose handles. Pure shape-translation: callers (i.e.
+ * `Database.watch`) own validation of unbound parameters, schema-change
+ * invalidation, and registration with the executor.
+ *
+ * Throws synchronously if:
+ * - any referenced table no longer exists in the schema;
+ * - any column referenced in `key` / `groupBy` / `columns` does not exist
+ *   on its table.
+ */
+export function subscriptionFromChangeScope(scope, handler, id, ctx) {
+    const bindings = new Map();
+    const relationToBase = new Map();
+    const pkIndicesByBase = new Map();
+    const dependencies = new Set();
+    const captureDisposers = [];
+    const plans = [];
+    scope.watches.forEach((watch, i) => {
+        const info = ctx.resolveTable(watch.table);
+        if (!info) {
+            throw new QuereusError(`watch: table ${watch.table.schema}.${watch.table.table} does not exist`, StatusCode.ERROR);
+        }
+        const base = baseKeyFor(watch.table);
+        const relKey = relKeyForWatch(watch.table, i);
+        dependencies.add(base);
+        relationToBase.set(relKey, base);
+        if (!pkIndicesByBase.has(base)) {
+            pkIndicesByBase.set(base, info.pkIndices);
+        }
+        const extras = new Set();
+        const pkSet = new Set(info.pkIndices);
+        const recordExtras = (cols) => {
+            for (const c of cols) {
+                if (!pkSet.has(c))
+                    extras.add(c);
+            }
+        };
+        let mode;
+        let literalValues = [];
+        switch (watch.scope.kind) {
+            case 'full': {
+                mode = { kind: 'global' };
+                if (watch.columns !== 'all') {
+                    for (const name of watch.columns) {
+                        const idx = resolveColumn(watch.table, info, name);
+                        if (!pkSet.has(idx))
+                            extras.add(idx);
+                    }
+                }
+                break;
+            }
+            case 'rows': {
+                const keyCols = watch.scope.key.map(n => resolveColumn(watch.table, info, n));
+                literalValues = literalValuesOnly(watch.scope.values);
+                recordExtras(keyCols);
+                mode = { kind: 'row', keyColumns: keyCols };
+                break;
+            }
+            case 'groups': {
+                const groupCols = watch.scope.groupBy.map(n => resolveColumn(watch.table, info, n));
+                recordExtras(groupCols);
+                mode = { kind: 'group', groupColumns: groupCols };
+                break;
+            }
+            case 'rowsByGroup': {
+                const groupCols = watch.scope.groupBy.map(n => resolveColumn(watch.table, info, n));
+                literalValues = literalValuesOnly(watch.scope.values);
+                recordExtras(groupCols);
+                mode = { kind: 'group', groupColumns: groupCols };
+                break;
+            }
+        }
+        bindings.set(relKey, mode);
+        if (extras.size > 0) {
+            captureDisposers.push(ctx.registerCaptureSpec(base, { extraColumns: extras }));
+        }
+        plans.push({ watch, relKey, base, literalValues });
+    });
+    const apply = async (input) => {
+        const matched = [];
+        for (const plan of plans) {
+            const { watch, relKey, literalValues } = plan;
+            const isGlobal = input.globalRelations.has(relKey);
+            const kernelTuples = input.perRelationTuples.get(relKey);
+            if (!isGlobal && !kernelTuples) {
+                // No change for this watch's base; skip.
+                continue;
+            }
+            let hits;
+            let observable;
+            switch (watch.scope.kind) {
+                case 'full': {
+                    // Column-narrowing for `full + columns` is best-effort in v1:
+                    // we register a capture spec but always fire on any change.
+                    hits = [];
+                    // Fire whenever the table was touched (kernel signals via
+                    // globalRelations for 'global' bindings).
+                    observable = isGlobal;
+                    break;
+                }
+                case 'rows': {
+                    if (isGlobal) {
+                        // Kernel fell back to global; we can't narrow precisely.
+                        // Surface every literal value the watch was registered
+                        // for so the handler treats them all as possibly-changed.
+                        hits = literalValues;
+                        observable = hits.length > 0;
+                    }
+                    else {
+                        hits = intersectTuples(kernelTuples ?? [], literalValues);
+                        observable = hits.length > 0;
+                    }
+                    break;
+                }
+                case 'groups': {
+                    hits = isGlobal ? [] : (kernelTuples ?? []);
+                    observable = hits.length > 0;
+                    break;
+                }
+                case 'rowsByGroup': {
+                    if (isGlobal) {
+                        hits = literalValues;
+                    }
+                    else {
+                        hits = intersectTuples(kernelTuples ?? [], literalValues);
+                    }
+                    observable = hits.length > 0;
+                    break;
+                }
+            }
+            if (observable)
+                matched.push({ watch, hits });
+        }
+        if (matched.length === 0)
+            return;
+        const event = { matched, txnId: ctx.getCurrentTxnId() };
+        try {
+            const r = handler(event);
+            if (r && typeof r.then === 'function') {
+                await r;
+            }
+        }
+        catch (err) {
+            log('Watch handler %s threw: %O', id, err);
+        }
+    };
+    const subscription = {
+        id,
+        dependencies,
+        bindings,
+        relationToBase,
+        pkIndicesByBase,
+        apply,
+        dispose: () => { },
+    };
+    return { subscription, captureDisposers };
+}
+/**
+ * Filter a ScopeValue-tuple list to literal-only tuples.
+ *
+ * `Database.watch` rejects scopes with `unboundParameters.length > 0` up
+ * front, so by the time we reach here, any surviving `ParamScopeValue`
+ * placeholders represent a caller-side bug; we drop them defensively
+ * rather than throw deep in the runtime path.
+ */
+function literalValuesOnly(values) {
+    const out = [];
+    for (const tuple of values) {
+        let allLiteral = true;
+        const lit = [];
+        for (const v of tuple) {
+            if (v !== null && typeof v === 'object' && !(v instanceof Uint8Array) && !Array.isArray(v) && v.kind === 'param') {
+                allLiteral = false;
+                break;
+            }
+            lit.push(v);
+        }
+        if (allLiteral)
+            out.push(lit);
+    }
+    return out;
+}
+function intersectTuples(kernel, watch) {
+    if (watch.length === 0)
+        return [];
+    const watchKeys = new Set();
+    for (const t of watch)
+        watchKeys.add(tupleKey(t));
+    const out = [];
+    const seen = new Set();
+    for (const kt of kernel) {
+        const k = tupleKey(kt);
+        if (!watchKeys.has(k) || seen.has(k))
+            continue;
+        seen.add(k);
+        out.push([...kt]);
+    }
+    return out;
+}
+//# sourceMappingURL=delta-executor.js.map

package/dist/src/runtime/delta-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delta-executor.js","sourceRoot":"","sources":["../../../src/runtime/delta-executor.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/alter-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alter-table.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/alter-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAmD,MAAM,uBAAuB,CAAC;AAUtI,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,GAAG,WAAW,CA2CvF;AA2mBD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAClC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,QAAQ,EAAE,0BAA0B,EAAE,GACpC,MAAM,CA4CR"}
+{"version":3,"file":"alter-table.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/alter-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAmD,MAAM,uBAAuB,CAAC;AAkBtI,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,GAAG,WAAW,CA2CvF;AAypBD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAClC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,QAAQ,EAAE,0BAA0B,EAAE,GACpC,MAAM,CAuCR"}

package/dist/src/runtime/emit/alter-table.js

@@ -5,7 +5,14 @@ import { buildColumnIndexMap, opsToMask, withGeneratedColumnGraph } from '../../
 import { MemoryTableModule } from '../../vtab/memory/module.js';
 import { quoteIdentifier, expressionToString, selectToString } from '../../emit/ast-stringify.js';
 import { renameTableInAst, renameColumnInAst } from '../../schema/rename-rewriter.js';
+import { tryFoldLiteral } from '../../parser/utils.js';
 const log = createLogger('runtime:emit:alter-table');
+function qualifyTableName(schemaName, tableName) {
+    const prefix = (schemaName && schemaName.toLowerCase() !== 'main')
+        ? `${quoteIdentifier(schemaName)}.`
+        : '';
+    return `${prefix}${quoteIdentifier(tableName)}`;
+}
 export function emitAlterTable(plan, _ctx) {
     const tableSchema = plan.table.tableSchema;
     const action = plan.action;
@@ -142,11 +149,31 @@ async function runAddColumn(rctx, tableSchema, schema, columnDef) {
     if (columnDef.constraints?.some(c => c.type === 'primaryKey')) {
         throw new QuereusError(`Cannot add a PRIMARY KEY column via ALTER TABLE`, StatusCode.ERROR);
     }
+    // Reject non-foldable DEFAULT expressions at DDL time. ADD COLUMN backfills
+    // existing rows with the DEFAULT value, so the expression must evaluate to a
+    // concrete literal at ALTER time. Column references, bind parameters, and
+    // non-deterministic function calls don't fold and are rejected per the
+    // determinism rule (consistent with CREATE TABLE's DEFAULT validation).
+    const defaultConstraint = columnDef.constraints?.find(c => c.type === 'default');
+    if (defaultConstraint && defaultConstraint.expr && tryFoldLiteral(defaultConstraint.expr) === undefined) {
+        throw new QuereusError(`ALTER TABLE ADD COLUMN DEFAULT for '${columnDef.name}' must fold to a literal — column references, bind parameters, and non-deterministic expressions are not allowed`, StatusCode.ERROR);
+    }
     // Call module.alterTable for data + schema update
     const module = tableSchema.vtabModule;
     if (!module.alterTable) {
         throw new QuereusError(`Module for table '${tableSchema.name}' does not support ALTER TABLE ADD COLUMN`, StatusCode.UNSUPPORTED);
     }
+    // NOT NULL without a usable DEFAULT cannot backfill existing rows. A DEFAULT whose
+    // folded value is NULL is equivalent to "no DEFAULT" for this purpose. If the table
+    // is non-empty, reject before mutating any schema or data.
+    const hasNotNull = columnDef.constraints?.some(c => c.type === 'notNull') ?? false;
+    if (hasNotNull) {
+        const folded = defaultConstraint?.expr ? tryFoldLiteral(defaultConstraint.expr) : undefined;
+        const defaultIsNullish = !defaultConstraint || folded === undefined || folded === null;
+        if (defaultIsNullish) {
+            await validateNotNullBackfill(rctx, tableSchema, columnDef.name);
+        }
+    }
     // Extract column-level CHECK / FK constraints. Column-level UNIQUE is not enforced via
     // table-level constraints; the existing rejection path in the manager handles it.
     const newCheckConstraints = extractColumnLevelCheckConstraints(columnDef);
@@ -258,10 +285,7 @@ function extractColumnLevelForeignKeys(columnDef, defaultSchemaName) {
  * `not (<check_expr>)` is a violation and aborts the ALTER.
  */
 async function validateBackfillAgainstChecks(rctx, enhancedTableSchema, newCheckConstraints) {
-    const schemaPrefix = (enhancedTableSchema.schemaName && enhancedTableSchema.schemaName.toLowerCase() !== 'main')
-        ? `${quoteIdentifier(enhancedTableSchema.schemaName)}.`
-        : '';
-    const qualifiedTable = `${schemaPrefix}${quoteIdentifier(enhancedTableSchema.name)}`;
+    const qualifiedTable = qualifyTableName(enhancedTableSchema.schemaName, enhancedTableSchema.name);
     for (const cc of newCheckConstraints) {
         const checkSql = expressionToString(cc.expr);
         const sql = `select 1 from ${qualifiedTable} where not (${checkSql}) limit 1`;
@@ -281,6 +305,23 @@ async function validateBackfillAgainstChecks(rctx, enhancedTableSchema, newCheck
         }
     }
 }
+/**
+ * Rejects ADD COLUMN ... NOT NULL when no usable DEFAULT is supplied and the
+ * table already has rows. The pre-mutation form means no rollback is needed —
+ * the schema and module state are still untouched at this point.
+ */
+async function validateNotNullBackfill(rctx, tableSchema, newColumnName) {
+    const qualifiedTable = qualifyTableName(tableSchema.schemaName, tableSchema.name);
+    const stmt = rctx.db.prepare(`select 1 from ${qualifiedTable} limit 1`);
+    try {
+        for await (const _row of stmt._iterateRowsRaw()) {
+            throw new QuereusError(`NOT NULL constraint failed for column '${newColumnName}' added to ${tableSchema.schemaName}.${tableSchema.name} — column has no DEFAULT and existing rows cannot be backfilled`, StatusCode.CONSTRAINT);
+        }
+    }
+    finally {
+        await stmt.finalize();
+    }
+}
 async function runDropColumn(rctx, tableSchema, schema, columnName) {
     const colIndex = tableSchema.columnIndexMap.get(columnName.toLowerCase());
     if (colIndex === undefined) {
@@ -529,10 +570,6 @@ async function rebuildMemoryTable(rctx, tableSchema, schema, module, survivingCo
  * the shadow table faithfully mirrors the original schema.
  */
 export function buildShadowTableDdl(tableSchema, shadowName, survivingColumns, newPkDef) {
-    const schemaName = tableSchema.schemaName;
-    const schemaPrefix = (schemaName && schemaName.toLowerCase() !== 'main')
-        ? `${quoteIdentifier(schemaName)}.`
-        : '';
     const colDefs = [];
     for (const colName of survivingColumns) {
         const idx = tableSchema.columnIndexMap.get(colName.toLowerCase());
@@ -556,7 +593,7 @@ export function buildShadowTableDdl(tableSchema, shadowName, survivingColumns, n
             entry += ' desc';
         pkColNames.push(entry);
     }
-    let createDdl = `create table ${schemaPrefix}${quoteIdentifier(shadowName)} (${colDefs.join(', ')}`;
+    let createDdl = `create table ${qualifyTableName(tableSchema.schemaName, shadowName)} (${colDefs.join(', ')}`;
     createDdl += pkColNames.length > 0
         ? `, primary key (${pkColNames.join(', ')}))`
         : `)`;
@@ -577,21 +614,20 @@ export function buildShadowTableDdl(tableSchema, shadowName, survivingColumns, n
 async function rebuildViaShadowTable(rctx, tableSchema, schema, survivingColumns, newPkDef) {
     const tableName = tableSchema.name;
     const schemaName = tableSchema.schemaName;
-    const schemaPrefix = (schemaName && schemaName.toLowerCase() !== 'main')
-        ? `${quoteIdentifier(schemaName)}.`
-        : '';
     const shadowName = `${tableName}__rekey_${Date.now()}`;
+    const qualifiedShadow = qualifyTableName(schemaName, shadowName);
+    const qualifiedTable = qualifyTableName(schemaName, tableName);
     const createDdl = buildShadowTableDdl(tableSchema, shadowName, survivingColumns, newPkDef);
     const projection = survivingColumns.map(c => quoteIdentifier(c)).join(', ');
     try {
         await rctx.db._execWithinTransaction(createDdl);
-        await rctx.db._execWithinTransaction(`insert into ${schemaPrefix}${quoteIdentifier(shadowName)} (${projection}) select ${projection} from ${schemaPrefix}${quoteIdentifier(tableName)}`);
-        await rctx.db._execWithinTransaction(`drop table ${schemaPrefix}${quoteIdentifier(tableName)}`);
-        await rctx.db._execWithinTransaction(`alter table ${schemaPrefix}${quoteIdentifier(shadowName)} rename to ${quoteIdentifier(tableName)}`);
+        await rctx.db._execWithinTransaction(`insert into ${qualifiedShadow} (${projection}) select ${projection} from ${qualifiedTable}`);
+        await rctx.db._execWithinTransaction(`drop table ${qualifiedTable}`);
+        await rctx.db._execWithinTransaction(`alter table ${qualifiedShadow} rename to ${quoteIdentifier(tableName)}`);
     }
     catch (e) {
         try {
-            await rctx.db._execWithinTransaction(`drop table if exists ${schemaPrefix}${quoteIdentifier(shadowName)}`);
+            await rctx.db._execWithinTransaction(`drop table if exists ${qualifiedShadow}`);
         }
         catch { /* ignore */ }
         throw e;