mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 11:06:06 +00:00
fix(db): fail plugin-data erasure on errors other than a missing table
deletePluginUserData swallowed every error from its three DELETEs, so a lost connection or a refused statement on Postgres looked like success and left the user's plugin rows behind. It now skips only a table that does not exist, the case its comment described (a slimmed-down schema), and rethrows anything else. The missing-table test moves to isMissingTableError in migration-utils, which already decided this for the migrations: the ORM maps SQLite's "no such table" and Postgres's 42P01 to TableNotFoundException. The docstring keeps the intent and drops the plan history.
This commit is contained in:
@@ -80,12 +80,20 @@ export async function execUnlessTableMissing(migration: Migration, sql: string,
|
||||
try {
|
||||
await migration.execute(sql, params);
|
||||
} catch (err: unknown) {
|
||||
const missing =
|
||||
err instanceof TableNotFoundException || (err instanceof Error && err.message.includes('no such table'));
|
||||
if (!missing) throw err;
|
||||
if (!isMissingTableError(err)) throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* True when a statement failed because its table does not exist. The ORM maps
|
||||
* SQLite's "no such table" and Postgres's SQLSTATE 42P01 to
|
||||
* `TableNotFoundException`; the raw SQLite message is checked too, for an error
|
||||
* that reached the caller unconverted.
|
||||
*/
|
||||
export function isMissingTableError(err: unknown): boolean {
|
||||
return err instanceof TableNotFoundException || (err instanceof Error && err.message.includes('no such table'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs a group of statements the legacy step wrapped in a single swallowing
|
||||
* try/catch. A failure part-way through leaves the earlier statements applied,
|
||||
|
||||
@@ -1,19 +1,12 @@
|
||||
import { isMissingTableError } from '../migration-utils';
|
||||
import type { EntityManager } from '@mikro-orm/core';
|
||||
|
||||
/**
|
||||
* Plan 3i Task 3 — R1's raw-connection exception, named ahead of this plan by
|
||||
* the program brief's own rule 4 ("connection.execute() (only in
|
||||
* MaintenanceRepository/DemoRepository, with a comment)").
|
||||
*
|
||||
* Not a `TrekRepository<Entity>` — it backs no table and no entity of its
|
||||
* own. It holds the statements no entity can express that run on every
|
||||
* engine: the readiness ping and the plugin-table erasure. `find/findOne →
|
||||
* create/assign/flush → nativeUpdate/nativeDelete → em.upsert → qb() →
|
||||
* em.getKysely()` all fail for them, so `connection.execute()` (the last
|
||||
* tier in the program's query-API order) is the correct tool, not a
|
||||
* shortcut around it. The SQLite file's own maintenance (`PRAGMA
|
||||
* wal_checkpoint`, `VACUUM INTO`) is `SqliteMaintenance`, under
|
||||
* `db/engine/sqlite/`.
|
||||
* Raw-connection statements that run on every engine and that no entity can
|
||||
* express: the readiness ping and the plugin-table erasure. Not a
|
||||
* `TrekRepository<Entity>`, since it backs no entity. The SQLite file's own
|
||||
* maintenance (`PRAGMA wal_checkpoint`, `VACUUM INTO`) lives in
|
||||
* `SqliteMaintenance`, under `db/engine/sqlite/`.
|
||||
*
|
||||
* Provided through Nest DI by `MaintenanceModule` (`nest/database/`), a
|
||||
* factory over the context-resolving global `EntityManager`; its consumers
|
||||
@@ -42,37 +35,15 @@ export class MaintenanceRepository {
|
||||
}
|
||||
|
||||
/**
|
||||
* Plan 4 Task 4 — UC1 (`UserCleanupService.erasePluginUserData`): a
|
||||
* best-effort per-user delete across the three plugin-held tables
|
||||
* (`plugin_user_config`/`plugin_oauth_tokens`/`plugin_oauth_state`). These
|
||||
* are `nest/plugins`' own tables (Plan 3b Task 5's "stays raw" ruling,
|
||||
* narrowed by Plan 4 Task 8a to just this trio — UC2/UC3 already moved to
|
||||
* `PluginsRepository`/`PluginUserErasureQueueRepository`), not an entity
|
||||
* managed by any repository, so `connection.execute()` (rule 4's last
|
||||
* tier) is the correct tool here, same shape as `ping` above and
|
||||
* `SqliteMaintenance`'s statements — with ONE difference those don't need: this is
|
||||
* the first `MaintenanceRepository` caller ever invoked from INSIDE an
|
||||
* open `UnitOfWork.transactional(...)` (`deleteUserCompletely`'s
|
||||
* transaction). `Connection#execute(query, params, method, ctx)`'s `ctx`
|
||||
* defaults to the plain (non-transactional) Kysely client when omitted —
|
||||
* `SqliteMaintenance`'s statements always omit it because their callers
|
||||
* (the backup port) never run inside a transaction, but
|
||||
* omitting it here deadlocked: this repo's `better-sqlite3` connection is
|
||||
* single-connection/single-writer, the open transaction holds it for its
|
||||
* whole lifetime, and a bare `execute()` tries to check out that SAME
|
||||
* connection fresh instead of reusing the held one — a checkout that only
|
||||
* frees once the transaction (which is itself awaiting THIS call)
|
||||
* completes. `em.getTransactionContext()` returns the open transaction's
|
||||
* driver handle when called from inside one (resolved the same
|
||||
* `TransactionContext`-async-local-storage way `getContext()` is, so
|
||||
* `this.em` need not be the transactional fork itself) and `undefined`
|
||||
* otherwise, so passing it through is correct both inside and outside a
|
||||
* transaction. Each statement is independently best-effort: a
|
||||
* slimmed-down test schema may not carry one or more of these tables at
|
||||
* all, matching the legacy per-table try/catch exactly. Each one runs in
|
||||
* its own savepoint (a nested `em.transactional`), because on Postgres a
|
||||
* failed statement aborts the whole transaction it is in: the savepoint
|
||||
* rolls back that one statement and the user's erasure goes on.
|
||||
* The per-user erasure of the three plugin-held tables (`plugin_user_config`,
|
||||
* `plugin_oauth_tokens`, `plugin_oauth_state`), called inside the erasure's
|
||||
* own `UnitOfWork.transactional(...)`.
|
||||
*
|
||||
* A table that does not exist (a slimmed-down test schema) is skipped; any
|
||||
* other failure propagates. Each statement runs in its own savepoint, since
|
||||
* on Postgres a failed statement aborts the whole transaction it is in.
|
||||
* `em.getTransactionContext()` hands the statement the open transaction's
|
||||
* connection, which a bare `execute()` would wait on forever.
|
||||
*/
|
||||
async deletePluginUserData(userId: number): Promise<void> {
|
||||
this.validateRequestContext();
|
||||
@@ -83,8 +54,8 @@ export class MaintenanceRepository {
|
||||
.getConnection()
|
||||
.execute(`DELETE FROM ${table} WHERE user_id = ?`, [userId], 'run', em.getTransactionContext()),
|
||||
);
|
||||
} catch {
|
||||
/* table absent (slim schema) */
|
||||
} catch (err: unknown) {
|
||||
if (!isMissingTableError(err)) throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { MaintenanceRepository } from '../../../../src/db/repositories/MaintenanceRepository';
|
||||
import { createSnapshotTestDb } from '../../../helpers/db-mock';
|
||||
import { createTestOrm, type TestOrm } from '../../../helpers/test-orm';
|
||||
import { TableNotFoundException } from '@mikro-orm/core';
|
||||
|
||||
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
@@ -45,4 +46,18 @@ describe('MaintenanceRepository', () => {
|
||||
await fresh.close(false);
|
||||
}
|
||||
});
|
||||
|
||||
it('MAINTREPO-005: deletePluginUserData skips an absent table and rethrows any other failure', async () => {
|
||||
const spy = vi.spyOn(t.em.getConnection(), 'execute');
|
||||
try {
|
||||
// The first statement is the user_config delete, so the one-shot rejection lands on it.
|
||||
spy.mockRejectedValueOnce(new TableNotFoundException(new Error('no such table: plugin_user_config')));
|
||||
await expect(maintenance.deletePluginUserData(1)).resolves.toBeUndefined();
|
||||
|
||||
spy.mockRejectedValueOnce(new Error('connection lost'));
|
||||
await expect(maintenance.deletePluginUserData(1)).rejects.toThrow('connection lost');
|
||||
} finally {
|
||||
spy.mockRestore();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user