From e5242b37a474de61ddccb29acbacd8b54f1688bb Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 5 Apr 2026 03:08:34 +0000
Subject: [PATCH] Fix baseline: only mark migrations applied if schema changes
 already exist

Previously the baseline marked ALL migrations as done, causing 0001 to
be skipped even on databases that didn't have the currency column yet.

Now each migration is checked against a sentinel column/table before
being seeded into the tracking table. Migrations whose changes don't
exist yet are left out so migrate() runs them normally.

https://claude.ai/code/session_012sqEgNQpx676isepeoX4Mi
---
 src/server/db/migrate.ts | 49 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/server/db/migrate.ts b/src/server/db/migrate.ts
index 6876189..fe9e0d7 100644
--- a/src/server/db/migrate.ts
+++ b/src/server/db/migrate.ts
@@ -44,7 +44,9 @@ const db = drizzle(pool);
 
 /**
  * Baseline: if the DB has existing tables but no migration history, seed the
- * __drizzle_migrations table so Drizzle won't try to re-run already-applied SQL.
+ * __drizzle_migrations table for only the migrations already reflected in the
+ * schema. Any migrations whose schema changes are NOT yet present will be left
+ * out so Drizzle runs them normally.
  */
 async function baselineIfNeeded(client: Pool) {
   // Check if migration tracking table exists and has entries
@@ -66,7 +68,7 @@ async function baselineIfNeeded(client: Pool) {
     }
   }
 
-  // No migration history. Check if the DB already has our tables (was db:push'd).
+  // No migration history. Check if the DB already has our core tables (was db:push'd).
   const { rows: tableRows } = await client.query<{ count: string }>(`
     SELECT COUNT(*)::text AS count
     FROM information_schema.tables
@@ -76,7 +78,7 @@ async function baselineIfNeeded(client: Pool) {
   const dbAlreadyExists = parseInt(tableRows[0]?.count ?? "0") > 0;
 
   if (!dbAlreadyExists) {
-    // Fresh database — let migrate() run normally
+    // Fresh database — let migrate() run all SQL normally
     return;
   }
 
@@ -92,12 +94,20 @@ async function baselineIfNeeded(client: Pool) {
     )
   `);
 
-  // Read the journal and seed a record for every migration file
+  // For each migration, check whether its schema changes already exist in the DB.
+  // Only seed a record for migrations that are fully applied; leave the rest for
+  // migrate() to run.
   const journal = JSON.parse(
     fs.readFileSync(path.join(migrationsFolder, "meta/_journal.json"), "utf8")
   ) as { entries: { idx: number; tag: string; when: number }[] };
 
   for (const entry of journal.entries) {
+    const alreadyApplied = await isMigrationApplied(client, entry.tag);
+    if (!alreadyApplied) {
+      console.log(`[migrate] Not yet applied, will run: ${entry.tag}`);
+      continue;
+    }
+
     const sqlPath = path.join(migrationsFolder, `${entry.tag}.sql`);
     const sql = fs.readFileSync(sqlPath, "utf8");
     const hash = crypto.createHash("sha256").update(sql).digest("hex");
@@ -109,7 +119,36 @@ async function baselineIfNeeded(client: Pool) {
     console.log(`[migrate] Baselined: ${entry.tag}`);
   }
 
-  console.log("[migrate] Baseline complete — future migrations will apply normally");
+  console.log("[migrate] Baseline complete");
+}
+
+/**
+ * Check whether a specific migration's schema changes already exist in the DB.
+ * Each migration tag maps to a sentinel check that uniquely identifies it.
+ */
+async function isMigrationApplied(client: Pool, tag: string): Promise<boolean> {
+  if (tag === "0000_glossy_magneto") {
+    // 0000 creates beenvoice_account — check it exists
+    const { rows } = await client.query<{ count: string }>(`
+      SELECT COUNT(*)::text AS count FROM information_schema.tables
+      WHERE table_schema = 'public' AND table_name = 'beenvoice_account'
+    `);
+    return parseInt(rows[0]?.count ?? "0") > 0;
+  }
+
+  if (tag === "0001_supreme_the_enforcers") {
+    // 0001 adds currency column to beenvoice_client — check it exists
+    const { rows } = await client.query<{ count: string }>(`
+      SELECT COUNT(*)::text AS count FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name = 'beenvoice_client'
+        AND column_name = 'currency'
+    `);
+    return parseInt(rows[0]?.count ?? "0") > 0;
+  }
+
+  // Unknown migration — assume not applied so it runs
+  return false;
 }
 
 console.log("[migrate] Running migrations from", migrationsFolder);