@remit/drizzle-service 1.0.2 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/databases.ts

@@ -4,11 +4,13 @@ import type { Db, SqliteStore } from "./db.js";
 import { messageDataSchema } from "./schema/message-data.js";
 import { createSqliteDatabase } from "./sqlite-client.js";
 
-// The three databases a self-host instance runs on (#1420). The app database
-// holds what lives in the client: accounts, config, rules, settings and auth.
-// The tenant mail database holds what lives on the IMAP server, plus the local
-// rows that refer to it. The tenant search database holds the full-text index,
-// rebuilt from the mail database, so it never commits together with it.
+// The three databases an instance runs on (#1420), each on the file its
+// SQLITE_*_DB_PATH names; a self-host points all three at one remit.db. The app
+// database holds what lives in the client: accounts, config, rules, settings
+// and auth. The tenant mail database holds what lives on the IMAP server, plus
+// the local rows that refer to it. The tenant search database holds the
+// full-text index, rebuilt from the mail database, so it never commits together
+// with it.
 export interface SqliteDatabases {
 	app: Db<Record<string, unknown>>;
 	mail: Db<Record<string, unknown>>;

package/src/schema-version-accounting.sqlite.test.ts

@@ -68,15 +68,18 @@ const journalEntries = (set: string): unknown[] => {
 };
 
 /**
- * The `<file>:<table>` pairs `read_schema_version` in the wrapper sums on the
- * live databases.
+ * The `<database>:<table>` pairs `read_schema_version` in the wrapper sums on
+ * the live databases, each database read from the file it is configured on.
  */
 const wrapperCountedTables = (): string[] => {
 	const match = read("deploy/vps/remit").match(
-		/for p in ((?:\w+\.db:__drizzle_migrations_\w+ ?)+); do/,
+		/for p in ((?:\$_sv_\w+:__drizzle_migrations_\w+ ?)+); do/,
 	);
 	assert.ok(match, "the wrapper no longer sums any __drizzle_migrations table");
-	return match[1].trim().split(/\s+/);
+	return match[1]
+		.trim()
+		.split(/\s+/)
+		.map((pair) => pair.replace(/^\$_sv_/, ""));
 };
 
 describe("schema version accounting", () => {
@@ -147,7 +150,7 @@ describe("schema version accounting", () => {
 	test("the wrapper counts exactly the tables the migrator writes", () => {
 		assert.deepEqual(
 			wrapperCountedTables().sort(),
-			sets.map(({ database, table }) => `${database}.db:${table}`).sort(),
+			sets.map(({ database, table }) => `${database}:${table}`).sort(),
 		);
 	});