Fix migration ordering and test detection for branch databases

- Add score_locks migration for the editing feature
- Detect Vitest runs via VITEST env var to skip branch-specific database
  suffix in unit and e2e tests
- Move checkOrphans before main in db-cleanup.ts to fix const hoisting

Signed-off-by: Mike Lischke <mike@lischke-online.de>

Author: mike-lischke

build/db-cleanup.ts

@@ -51,6 +51,35 @@ const getLocalBranches = (): Set<string> => {
     }
 };
 
+const checkOrphans = (dbNames: string[], expectedDbs: Set<string>, prefix: string): void => {
+    const orphans: string[] = [];
+
+    for (const dbName of dbNames) {
+        if (dbName.includes("__") && !expectedDbs.has(dbName)) {
+            orphans.push(dbName);
+        }
+    }
+
+    if (orphans.length === 0) {
+        console.log("No orphaned branch databases found.");
+
+        return;
+    }
+
+    console.log("Orphaned branch databases (branch no longer exists locally):");
+
+    for (const db of orphans) {
+        console.log(`  - ${db}`);
+    }
+
+    console.log(
+        "\nTo drop these databases manually, run:\n"
+        + orphans.map((db) => {
+            return "  echo 'DROP DATABASE `" + db + "`;' | mysql -u root -p";
+        }).join("\n"),
+    );
+};
+
 const main = async (): Promise<void> => {
     const config = loadConfig();
 
@@ -128,40 +157,6 @@ const main = async (): Promise<void> => {
     }
 };
 
-const checkOrphans = (
-    dbNames: string[],
-    expectedDbs: Set<string>,
-    prefix: string,
-): void => {
-    const orphans: string[] = [];
-
-    for (const dbName of dbNames) {
-        // Only check branch-specific databases (those with the __ prefix).
-        if (dbName.includes("__") && !expectedDbs.has(dbName)) {
-            orphans.push(dbName);
-        }
-    }
-
-    if (orphans.length === 0) {
-        console.log("No orphaned branch databases found.");
-
-        return;
-    }
-
-    console.log("Orphaned branch databases (branch no longer exists locally):");
-
-    for (const db of orphans) {
-        console.log(`  - ${db}`);
-    }
-
-    console.log(
-        "\nTo drop these databases manually, run:\n"
-        + orphans.map((db) => {
-            return "  echo 'DROP DATABASE `" + db + "`;' | mysql -u root -p";
-        }).join("\n"),
-    );
-};
-
 main().catch((e: unknown) => {
     console.error("Cleanup failed:", e);
     process.exit(1);

build/migration.ts

@@ -141,7 +141,7 @@ const getCurrentBranch = (): string => {
  * For feature branches the pattern is `<baseName>__<branchName>`.
  *
  * @param baseName The database name from backend-config.json.
- * @param branch The current Git branch name.
+ * @param branch The branch name to derive the suffix from.
  *
  * @returns The effective database name.
  */
@@ -162,7 +162,12 @@ export const deriveDbName = (baseName: string, branch: string): string => {
  */
 export const runMigrations = async (config: IDatabaseConfig): Promise<string> => {
     const branch = getCurrentBranch();
-    const effectiveDb = deriveDbName(config.database, branch);
+
+    // When running under Vitest (unit or e2e), use the base database name directly —
+    // no branch-specific suffix.
+    const effectiveDb = process.env.VITEST
+        ? config.database
+        : deriveDbName(config.database, branch);
 
     console.log(`Branch: ${branch}, database: ${effectiveDb}`);
 

tests/e2e/setup-real-db.spec.ts

@@ -84,6 +84,7 @@ test.describe.serial("Setup: real database integration", () => {
                 DB_NAME: testDbName,
                 DB_USER: dbUser,
                 DB_PASSWORD: dbPassword,
+                VITEST: "true",
             },
             stdio: "pipe",
         });