Separate framework and app migrations

Also add a new develop command: clear-db.

express/develop/clear-db.ts

@@ -0,0 +1,17 @@
+import { connectionConfig, migrate, pool } from "../database";
+import { dropTables, exitIfUnforced } from "./util";
+
+async function main(): Promise<void> {
+    exitIfUnforced();
+
+    try {
+        await dropTables();
+    } finally {
+        await pool.end();
+    }
+}
+
+main().catch((err) => {
+    console.error("Failed to clear database:", err.message);
+    process.exit(1);
+});

express/develop/reset-db.ts

@@ -1,38 +1,14 @@
 // reset-db.ts
 // Development command to wipe the database and apply all migrations from scratch
 
-import { migrate, pool, connectionConfig } from "../database";
+import { connectionConfig, migrate, pool } from "../database";
+import { dropTables, exitIfUnforced } from "./util";
 
 async function main(): Promise<void> {
-    const args = process.argv.slice(2);
-
-    // Require explicit confirmation unless --force is passed
-    if (!args.includes("--force")) {
-        console.error("This will DROP ALL TABLES in the database!");
-        console.error(`  Database: ${connectionConfig.database}`);
-        console.error(`  Host: ${connectionConfig.host}:${connectionConfig.port}`);
-        console.error("");
-        console.error("Run with --force to proceed.");
-        process.exit(1);
-    }
+    exitIfUnforced();
 
     try {
-        console.log("Dropping all tables...");
-
-        // Get all table names in the public schema
-        const result = await pool.query<{ tablename: string }>(`
-            SELECT tablename FROM pg_tables
-            WHERE schemaname = 'public'
-        `);
-
-        if (result.rows.length > 0) {
-            // Drop all tables with CASCADE to handle foreign key constraints
-            const tableNames = result.rows.map((r) => `"${r.tablename}"`).join(", ");
-            await pool.query(`DROP TABLE IF EXISTS ${tableNames} CASCADE`);
-            console.log(`Dropped ${result.rows.length} table(s)`);
-        } else {
-            console.log("No tables to drop");
-        }
+        await dropTables();
 
         console.log("");
         await migrate();

express/develop/util.ts

@@ -0,0 +1,42 @@
+// FIXME: this is at the wrong level of specificity
+
+import { connectionConfig, migrate, pool } from "../database";
+
+const exitIfUnforced = () => {
+    const args = process.argv.slice(2);
+
+    // Require explicit confirmation unless --force is passed
+    if (!args.includes("--force")) {
+        console.error("This will DROP ALL TABLES in the database!");
+        console.error(`  Database: ${connectionConfig.database}`);
+        console.error(
+            `  Host: ${connectionConfig.host}:${connectionConfig.port}`,
+        );
+        console.error("");
+        console.error("Run with --force to proceed.");
+        process.exit(1);
+    }
+};
+
+const dropTables = async () => {
+    console.log("Dropping all tables...");
+
+    // Get all table names in the public schema
+    const result = await pool.query<{ tablename: string }>(`
+            SELECT tablename FROM pg_tables
+            WHERE schemaname = 'public'
+        `);
+
+    if (result.rows.length > 0) {
+        // Drop all tables with CASCADE to handle foreign key constraints
+        const tableNames = result.rows
+            .map((r) => `"${r.tablename}"`)
+            .join(", ");
+        await pool.query(`DROP TABLE IF EXISTS ${tableNames} CASCADE`);
+        console.log(`Dropped ${result.rows.length} table(s)`);
+    } else {
+        console.log("No tables to drop");
+    }
+};
+
+export { dropTables, exitIfUnforced };