@remit/drizzle-service 0.0.34 → 0.0.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.34",
-  "description": "Drizzle ORM service parameterized by dialect (Postgres / SQLite)",
+  "version": "0.0.36",
+  "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -13,17 +13,13 @@
   },
   "scripts": {
     "test:typecheck": "tsgo --noEmit -p tsconfig.json",
-    "test:run:pg": "node --env-file=../../localhost-test-unit.env --import tsx --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/**/*.test.tsx' --test-coverage-lines=81 --test 'src/**/!(*.sqlite).test.ts'",
-    "test:run:sqlite": "node --env-file=../../localhost-test-unit-sqlite.env --import tsx --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/**/*.test.tsx' --test-coverage-lines=75 --test 'src/**/*.sqlite.test.ts'",
-    "test:run": "npm run test:run:pg && npm run test:run:sqlite",
+    "test:run": "node --env-file=../../localhost-test-unit-sqlite.env --import tsx --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/**/*.test.tsx' --test-coverage-lines=90 --test 'src/**/*.test.ts'",
     "test": "npm run test:typecheck && npm run test:run",
     "fix": "biome check --write src"
   },
   "devDependencies": {
     "@remit/api-zod-schemas": "*",
-    "@types/pg": "^8.0.0",
     "drizzle-kit": "^0.31.1",
-    "embedded-postgres": "^18.4.0-beta.17",
     "tsx": "*",
     "zod": "*"
   },
@@ -31,11 +27,8 @@
     "@remit/data-ports": "*",
     "@remit/domain-enums": "*",
     "drizzle-orm": "^0.45.2",
-    "pg": "^8.0.0",
-    "postgres": "^3.4.5",
     "short-uuid": "*",
     "uuid": "*",
-    "@remit/drizzle-pg-schema": "*",
     "@remit/drizzle-sqlite-schema": "*",
     "better-sqlite3": "^12.11.1",
     "@types/better-sqlite3": "^7.6.13"

package/src/db.ts

@@ -1,13 +1,13 @@
-import type { NodePgQueryResultHKT } from "drizzle-orm/node-postgres";
-import type { PgDatabase } from "drizzle-orm/pg-core";
+import type { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
 
 /**
  * A drizzle handle a repository can run on: the top-level database or a
  * transaction (or savepoint) bound to one. Both share the query-builder API, so
  * a repo constructed with either behaves the same — standalone, or enlisted in a
  * unit-of-work transaction.
+ *
+ * Internal to this adapter: it names better-sqlite3, so it is not exported from
+ * the package index and never appears on a shared surface.
  */
-export type Db<TSchema extends Record<string, unknown>> = PgDatabase<
-	NodePgQueryResultHKT,
-	TSchema
->;
+export type Db<TSchema extends Record<string, unknown>> =
+	BetterSQLite3Database<TSchema>;

package/src/error.ts

@@ -1,4 +1,4 @@
-// Re-export the shared error contract so an error thrown by a pg repo is the
+// Re-export the shared error contract so an error thrown by a repo here is the
 // same class the backend handlers and workers already catch (they import these
 // from @remit/data-ports/errors). Defining parallel classes here made
 // `instanceof NotFoundError` false across the adapter boundary — a fresh user's
@@ -14,7 +14,6 @@ export class NotImplementedError extends Error {
 	statusCode = 501;
 }
 
-const PG_UNIQUE_VIOLATION = "23505";
 // better-sqlite3 raises a `SqliteError` whose `.code` is one of these for a
 // primary-key or unique-index collision (RFC 036 D1).
 const SQLITE_UNIQUE_VIOLATIONS = new Set([
@@ -23,13 +22,11 @@ const SQLITE_UNIQUE_VIOLATIONS = new Set([
 ]);
 
 // Drizzle wraps the underlying driver error and carries the original (with its
-// SQLSTATE / SQLite `code`) on `.cause`, so walk the cause chain — covers both
-// the pg and better-sqlite3 drivers.
+// SQLite `code`) on `.cause`, so walk the cause chain.
 export const isUniqueViolation = (error: unknown): boolean => {
 	let current: unknown = error;
 	while (current) {
 		const code = (current as { code?: string }).code;
-		if (code === PG_UNIQUE_VIOLATION) return true;
 		if (code !== undefined && SQLITE_UNIQUE_VIOLATIONS.has(code)) return true;
 		current = (current as { cause?: unknown }).cause;
 	}

package/src/index.ts

@@ -3,7 +3,6 @@ export {
 	type CascadeDeleteLogger,
 	type CascadeDeleter,
 	type CascadeEntity,
-	createCascadeDeleter,
 	createSqliteCascadeDeleter,
 	runDrizzleCascadeDelete,
 } from "./repos/cascade-delete.js";

package/src/repair/thread-message-category-contract.ts

@@ -1,8 +1,6 @@
 /**
  * The behaviour `thread_message.category`'s repair (#321) must have, asserted
- * against a real engine of each dialect from one place: the statement ships in
- * two dialects and an assertion that only ran on one of them is how a dialect
- * quietly stops being repaired.
+ * against a real engine from one place.
  *
  * Every seed is raw SQL against the real column names, so it exercises the same
  * statement text the migrator runs rather than a drizzle re-spelling of it.
@@ -493,7 +491,7 @@ export const describeRepairContract = (
 			for (const stale of [
 				"2026-07-08",
 				"drizzle push",
-				"Postgres instance whose column was added",
+				"instance whose column was added",
 			]) {
 				assert.ok(
 					!text.includes(stale),

package/src/repair/thread-message-category.sqlite.test.ts

@@ -15,7 +15,6 @@ import {
 import { describeRepairContract } from "./thread-message-category-contract.js";
 
 const sqliteClient = (sqlite: Database.Database): RepairSqlClient => ({
-	dialect: "sqlite",
 	all: async (sql) => sqlite.prepare(sql).all(),
 	run: async (sql) => sqlite.prepare(sql).run().changes,
 });
@@ -88,7 +87,7 @@ describe("thread_message.category repair — SQLite's write lock", () => {
 		writer.exec("BEGIN IMMEDIATE");
 		try {
 			assert.throws(
-				() => reader.prepare(repairStatement("sqlite")).run(),
+				() => reader.prepare(repairStatement()).run(),
 				(error: unknown) =>
 					error instanceof Error &&
 					"code" in error &&

package/src/repair/thread-message-category.ts

@@ -9,7 +9,7 @@
  * before that read path goes live — otherwise the filter under-returns mail
  * with nothing masking it.
  *
- * One set-based statement per dialect. The value it copies is reachable through
+ * One set-based statement. The value it copies is reachable through
  * `message`'s primary key, so the write is single-valued by construction and
  * there is no checkpointing, batching or resumability here: an interrupted run
  * leaves a consistent table and the next start finishes the job.
@@ -33,14 +33,11 @@
  *  - It never overwrites a row that was written after the statement began. The
  *    migrate one-shot normally runs with every app service stopped, but
  *    `docker compose up -d` can restart it while workers still run, so the
- *    quiet window is not assumed. On SQLite writers are serialized, so a
- *    concurrent body-sync write lands wholly before or wholly after and both
- *    orders converge on the same value. On Postgres READ COMMITTED an UPDATE
- *    re-evaluates its WHERE clause against the version a concurrent
- *    transaction just committed, but still reads other tables at its original
- *    snapshot — so without the `updated_at` guard it could write a
- *    pre-classification value over the fresh one. The guard makes that row fail
- *    the re-check and the writer's value stands.
+ *    quiet window is not assumed. Writers are serialized, so a concurrent
+ *    body-sync write lands wholly before or wholly after and both orders
+ *    converge on the same value. The `updated_at` guard is the backstop: a row
+ *    a concurrent writer touched after the statement began fails the re-check,
+ *    so the writer's value stands rather than being reverted.
  *
  * The guard covers a writer whose transaction begins after the statement. A
  * writer that began before it and commits during it carries an older stamp and
@@ -75,15 +72,11 @@
  * bumped it would both lie about the row and defeat its own guard.
  */
 
-export type RepairDialect = "sqlite" | "postgres";
-
 /**
  * The smallest surface the repair needs, so this module imports nothing and can
- * be driven by the migrator's `better-sqlite3` handle, its `pg.Pool`, or a test
- * harness of either dialect.
+ * be driven by the migrator's `better-sqlite3` handle or a test harness.
  */
 export interface RepairSqlClient {
-	readonly dialect: RepairDialect;
 	all(sql: string): Promise<unknown[]>;
 	run(sql: string): Promise<number>;
 }
@@ -95,12 +88,9 @@ export interface RepairSqlClient {
  */
 const PENDING = "uncategorized";
 
-const nowMillis = (dialect: RepairDialect): string =>
-	dialect === "sqlite"
-		? "CAST(unixepoch('subsec') * 1000 AS INTEGER)"
-		: "CAST(EXTRACT(EPOCH FROM now()) * 1000 AS bigint)";
+const NOW_MILLIS = "CAST(unixepoch('subsec') * 1000 AS INTEGER)";
 
-export const repairStatement = (dialect: RepairDialect): string =>
+export const repairStatement = (): string =>
 	`UPDATE thread_message
 SET category = (
 	SELECT m.category FROM message m WHERE m.message_id = thread_message.message_id
@@ -111,7 +101,7 @@ WHERE EXISTS (
 	  AND m.category <> thread_message.category
 	  AND m.category <> '${PENDING}'
 )
-  AND thread_message.updated_at <= ${nowMillis(dialect)}`;
+  AND thread_message.updated_at <= ${NOW_MILLIS}`;
 
 const BUCKETS_SQL = `SELECT t.category AS row_category, m.category AS message_category, count(*) AS row_count
 FROM thread_message t
@@ -145,9 +135,9 @@ FROM (
  * every run until the stamp is corrected, which is a different thing to tell an
  * operator and would otherwise be indistinguishable in the output.
  */
-const residualSql = (dialect: RepairDialect): string =>
+const residualSql = (): string =>
 	`SELECT count(*) AS row_count,
-	coalesce(sum(CASE WHEN t.updated_at > ${nowMillis(dialect)} THEN 1 ELSE 0 END), 0) AS ahead_of_clock
+	coalesce(sum(CASE WHEN t.updated_at > ${NOW_MILLIS} THEN 1 ELSE 0 END), 0) AS ahead_of_clock
 FROM thread_message t
 JOIN message m ON m.message_id = t.message_id
 WHERE m.category <> t.category
@@ -220,7 +210,7 @@ const columnOf = (row: unknown, column: string): unknown => {
 	return row[column];
 };
 
-// node-postgres hands back bigint aggregates as strings, so a count is a number
+// A driver may hand back a bigint aggregate as a string, so a count is a number
 // or the decimal text of one, and anything else is a query that changed shape.
 const countOf = (row: unknown, column: string): number => {
 	const value = columnOf(row, column);
@@ -328,14 +318,14 @@ export const repairThreadMessageCategory = async (
 	client: RepairSqlClient,
 ): Promise<RepairResult> => {
 	const startedAt = Date.now();
-	const rowsWritten = await client.run(repairStatement(client.dialect));
+	const rowsWritten = await client.run(repairStatement());
 	return { rowsWritten, elapsedMs: Date.now() - startedAt };
 };
 
 export const readResidual = async (
 	client: RepairSqlClient,
 ): Promise<CategoryResidual> => {
-	const [row] = await client.all(residualSql(client.dialect));
+	const [row] = await client.all(residualSql());
 	return {
 		repairable: countOf(row, "row_count"),
 		aheadOfClock: countOf(row, "ahead_of_clock"),

package/src/repos/cascade-delete.ts

@@ -1,5 +1,5 @@
 import { and, eq, inArray, or, type SQL } from "drizzle-orm";
-import { drizzle, type NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { accountTable } from "../schema/i4-account-config.js";
 import { accountSettingTable } from "../schema/i4-account-setting.js";
 import { addressTable } from "../schema/i4-address.js";
@@ -24,13 +24,13 @@ export interface CascadeDeleteLogger {
 	info(obj: Record<string, unknown>, msg: string): void;
 }
 
-type CascadeDb = NodePgDatabase<Record<string, unknown>>;
+type CascadeDb = Db<Record<string, unknown>>;
 
 /**
  * Per-message entity types. Their rows are removed with the message subtree by
  * message id, so their individually-enumerated keys are not deleted one by one —
  * the DynamoDB cascade enumerates them only because BatchWriteItem needs each
- * full key; Postgres deletes them set-wise by message id.
+ * full key; the relational cascade deletes them set-wise by message id.
  */
 const MESSAGE_CHILD_TYPES = new Set([
 	"MessageFlag",
@@ -70,7 +70,7 @@ const groupByType = (
 };
 
 /**
- * Postgres equivalent of the DynamoDB BatchWriteItem cascade: delete every
+ * Relational equivalent of the DynamoDB BatchWriteItem cascade: delete every
  * enumerated row for an account/tenant in one transaction. Message subtrees
  * (message + nine child tables) are deleted set-wise by message id and emit a
  * `message.removed` outbox row each for search-index cleanup; the remaining
@@ -199,22 +199,9 @@ export type CascadeDeleter = (
 ) => Promise<void>;
 
 /**
- * Bind a cascade deleter to one Postgres connection. The account worker builds
- * this once at module load on the `DATA_BACKEND=postgres` path and reuses it
- * across invocations; the underlying pool is shared with no per-purge setup.
- */
-export const createCascadeDeleter = (connectionUrl: string): CascadeDeleter => {
-	const db = drizzle(connectionUrl) as CascadeDb;
-	return (entities, log) => runDrizzleCascadeDelete(db, entities, log);
-};
-
-/**
- * SQLite twin of {@link createCascadeDeleter} (RFC 036). Opens the shared SQLite
- * file through the same serialized connection every writer uses and binds a
- * cascade deleter to it. `runDrizzleCascadeDelete` deletes through the
- * dialect-selected entity tables (`active-entities`, SQLite on this backend), so
- * the same enumerated `CascadeEntity[]` drives an identical cascade over SQLite.
- * Async because opening the SQLite handle loads the native binding lazily.
+ * Open the shared SQLite file through the same serialized connection every
+ * writer uses and bind a cascade deleter to it. Async because opening the
+ * SQLite handle loads the native binding lazily.
  */
 export const createSqliteCascadeDeleter = async (
 	dbPath: string,
@@ -222,6 +209,5 @@ export const createSqliteCascadeDeleter = async (
 	const { db } = await createSqliteDatabase(messageDataSchema, {
 		filename: dbPath,
 	});
-	const cascadeDb = db as unknown as CascadeDb;
-	return (entities, log) => runDrizzleCascadeDelete(cascadeDb, entities, log);
+	return (entities, log) => runDrizzleCascadeDelete(db, entities, log);
 };

package/src/repos/category-fixture.ts

@@ -1,8 +1,8 @@
 import type { ThreadMessageItem } from "@remit/data-ports";
 
 /**
- * The measured category shape of the owner's INBOX, shared by the sqlite and
- * Postgres category suites (#304).
+ * The measured category shape of the owner's INBOX, shared by the category
+ * suites (#304).
  *
  * It lives in one module because the shape is the load-bearing part of the
  * regression: a filter resolved over the page the server returned is empty at
@@ -33,23 +33,6 @@ export const LIVE_TOTALS: CategoryTotals = {
 	social: 88,
 };
 
-/**
- * The same shape with the four common categories trimmed, for the Postgres twin.
- *
- * The rare tail is untouched — `social` stays at its measured 88 — so every
- * assertion the suites make about a rare category holds identically. What
- * shrinks is the bulk that only exists to make the common categories common,
- * which the Postgres suite does not assert on and which costs ~20s of seeding.
- */
-export const TRIMMED_TOTALS: CategoryTotals = {
-	personal: 700,
-	marketing: 500,
-	automated: 400,
-	newsletter: 200,
-	transactional: 130,
-	social: 88,
-};
-
 /**
  * The newest 100 rows of that INBOX, as measured. Two of the 4,753 personal
  * messages and two of the 88 social ones are in it, which is why selecting

package/src/repos/filter-anchor.ts

@@ -4,10 +4,10 @@ import type {
 	IFilterAnchorRepository,
 } from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { filterAnchorTable } from "../schema.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToFilterAnchor(
 	row: typeof filterAnchorTable.$inferSelect,
@@ -25,9 +25,9 @@ function rowToFilterAnchor(
 }
 
 /**
- * Postgres counterpart to `FilterAnchorService` (remit-electrodb-service). The
+ * Relational counterpart to `FilterAnchorService` (remit-electrodb-service). The
  * anchor vector is persisted inline on the row (RFC 034 Decision 2.1/2.3); the
- * pgvector store's per-message chunk vectors are read only by the search
+ * vector store's per-message chunk vectors are read only by the search
  * service when it builds the anchor, never re-derived here at match time.
  */
 export class FilterAnchorRepo implements IFilterAnchorRepository {

package/src/repos/filter.ts

@@ -11,13 +11,13 @@ import {
 	FilterState,
 } from "@remit/domain-enums";
 import { and, asc, eq, gt, or } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { filterTable } from "../schema.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 const RULE_ASSERTION_FIELDS = [
 	"hasAnchor",
@@ -293,7 +293,7 @@ export class FilterRepo implements IFilterRepository {
 	 * comparison. A no-op for a Standing filter (no `expiresAt`) or one already
 	 * Expired.
 	 *
-	 * Postgres has no TTL reaper, so an Expired Temporary row is never deleted by
+	 * There is no TTL reaper here, so an Expired Temporary row is never deleted by
 	 * a background sweep the way DynamoDB reaps it via the `ttl` attribute. That
 	 * is correct by design: RFC 034 Decision 1.1 makes match-time correctness
 	 * depend on the `expiresAt`/`now` comparison, never on the row's existence —

package/src/repos/i4-account-config.ts

@@ -9,7 +9,7 @@ import type {
 	UpdateAccountConfigInput,
 } from "@remit/data-ports";
 import { and, asc, eq, gt, inArray, or } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -19,7 +19,7 @@ import {
 } from "../schema/i4-account-config.js";
 import { addressTable } from "../schema/i4-address.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToAccountConfig(
 	row: typeof accountConfigTable.$inferSelect,

package/src/repos/i4-account-export-request.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateAccountExportRequestInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { accountExportRequestTable } from "../schema/i4-account-export-request.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToItem(
 	row: typeof accountExportRequestTable.$inferSelect,

package/src/repos/i4-account-setting.ts

@@ -6,10 +6,10 @@ import type {
 	UpsertAccountSettingInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { accountSettingTable } from "../schema/i4-account-setting.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 // The PG store derives its own deterministic id from the composite key. It is
 // stable within this backend but not byte-identical to the DDB base36 UUIDv5

package/src/repos/i4-account.ts

@@ -9,7 +9,7 @@ import type {
 } from "@remit/data-ports";
 import { SyncPhase } from "@remit/domain-enums";
 import { and, asc, eq, gt, inArray, or, sql } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, encodeToken, resultList } from "../pagination.js";
@@ -17,7 +17,7 @@ import { accountTable } from "../schema/i4-account-config.js";
 import { mailboxTable } from "../schema/i4-mailbox.js";
 import { rowToMailbox } from "./i4-mailbox.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 export function rowToAccount(
 	row: typeof accountTable.$inferSelect,

package/src/repos/i4-mailbox-lock.ts

@@ -4,11 +4,11 @@ import type {
 	WithMailboxLockResult,
 } from "@remit/data-ports";
 import { and, eq, lt } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { randomId } from "../id.js";
 import { mailboxLockTable } from "../schema/i4-mailbox-lock.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 const TTL_SECONDS = 3600;
 

package/src/repos/i4-mailbox-special-use.ts

@@ -4,11 +4,11 @@ import type {
 	MailboxSpecialUseValue,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { randomId } from "../id.js";
 import { mailboxSpecialUseTable, mailboxTable } from "../schema/i4-mailbox.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToSpecialUse(
 	row: typeof mailboxSpecialUseTable.$inferSelect,

package/src/repos/i4-mailbox.ts

@@ -8,8 +8,8 @@ import type {
 } from "@remit/data-ports";
 import { MailboxCursorState, MailboxSyncStatus } from "@remit/domain-enums";
 import { and, asc, eq, gt, inArray, or } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 import shortUuid from "short-uuid";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { mailboxTable } from "../schema/i4-mailbox.js";
@@ -19,7 +19,7 @@ const base36Translator = shortUuid.createTranslator(
 );
 const generateMailboxId = () => base36Translator.fromUUID(randomUUID());
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 export function rowToMailbox(
 	row: typeof mailboxTable.$inferSelect,

package/src/repos/i4-message-flag-push.test.ts

@@ -3,7 +3,7 @@ import { after, before, describe, test } from "node:test";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { MessageFlagPushRepo } from "./i4-message-flag-push.js";
 
-describe("MessageFlagPushRepo (Postgres counterpart to MessageFlagPushService)", () => {
+describe("MessageFlagPushRepo (relational counterpart to MessageFlagPushService)", () => {
 	let db: TestDb;
 	let close: () => Promise<void>;
 	let repo: MessageFlagPushRepo;

package/src/repos/i4-message-flag-push.ts

@@ -1,8 +1,8 @@
 import { and, eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { messageFlagPushTable } from "../schema/i4-message-flag-push.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 export type FlagPushOperation = "add" | "remove";
 export type MessageFlagPushState =
@@ -47,7 +47,7 @@ function rowToItem(
 }
 
 /**
- * Postgres counterpart to `MessageFlagPushService` (remit-electrodb-service).
+ * Relational counterpart to `MessageFlagPushService` (remit-electrodb-service).
  * Same public shape (`put`/`find`/`updateState`/`delete`/`listByAccountId`/
  * `listByMailboxId`) so both backends satisfy the same structural contract
  * for read-time unseenCount prediction (issue #1273, epic #1281 invariant 4)

package/src/repos/i4-message-placement-move.test.ts

@@ -3,7 +3,7 @@ import { after, before, describe, test } from "node:test";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { MessagePlacementMoveRepo } from "./i4-message-placement-move.js";
 
-describe("MessagePlacementMoveRepo (Postgres counterpart to MessagePlacementMoveService)", () => {
+describe("MessagePlacementMoveRepo (relational counterpart to MessagePlacementMoveService)", () => {
 	let db: TestDb;
 	let close: () => Promise<void>;
 	let repo: MessagePlacementMoveRepo;

package/src/repos/i4-message-placement-move.ts

@@ -1,8 +1,8 @@
 import { eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { messagePlacementMoveTable } from "../schema/i4-message-placement-move.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 export type MessagePlacementMoveState =
 	| "pending"
@@ -44,7 +44,8 @@ function rowToItem(
 }
 
 /**
- * Postgres counterpart to `MessagePlacementMoveService` (remit-electrodb-service).
+ * Relational counterpart to `MessagePlacementMoveService`
+ * (remit-electrodb-service).
  * Same public shape (`put`/`find`/`delete`/`listByAccountId`) so both backends
  * satisfy the same structural contract for read-time count prediction
  * (`mailbox.ts`'s `loadPendingMoves`, epic #1281 invariant 4).

package/src/repos/i4-organize-job-request.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateOrganizeJobRequestInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { organizeJobRequestTable } from "../schema/i4-organize-job-request.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToItem(
 	row: typeof organizeJobRequestTable.$inferSelect,

package/src/repos/i4-outbox-message.ts

@@ -6,12 +6,12 @@ import type {
 	UpdateOutboxMessageInput,
 } from "@remit/data-ports";
 import { and, desc, eq, inArray, lt, or } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { ForbiddenError, NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { outboxMessageTable } from "../schema/i4-outbox-message.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 function rowToOutboxMessage(
 	row: typeof outboxMessageTable.$inferSelect,

package/src/repos/label.ts

@@ -6,13 +6,13 @@ import type {
 	UpdateLabelInput,
 } from "@remit/data-ports";
 import { and, asc, eq, gt, or } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { labelTable } from "../schema.js";
 
-type DB = NodePgDatabase<Record<string, unknown>>;
+type DB = Db<Record<string, unknown>>;
 
 const normalize = (name: string): string => name.trim().toLowerCase();
 

package/src/repos/message-flag.ts

@@ -5,14 +5,14 @@ import type {
 	MessageFlagItem,
 } from "@remit/data-ports";
 import { and, eq, inArray } from "drizzle-orm";
-import type { NodePgDatabase } from "drizzle-orm/node-postgres";
+import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import {
 	type MessageDataSchema,
 	messageFlagTable,
 } from "../schema/message-data.js";
 
-type DB = NodePgDatabase<MessageDataSchema>;
+type DB = Db<MessageDataSchema>;
 
 function rowToMessageFlag(
 	row: typeof messageFlagTable.$inferSelect,