From 4c873b9921e2645c6f43614df81996e0c3c32da9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 10 Jun 2024 22:38:16 +0100
Subject: [PATCH] Attempting to fix some potential app migration issues around
 versions.

---
 .../src/appMigrations/appMigrationMetadata.ts      | 14 ++++++++------
 packages/server/src/appMigrations/index.ts         |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts
index d87ddff3ef..613f46cf3d 100644
--- a/packages/server/src/appMigrations/appMigrationMetadata.ts
+++ b/packages/server/src/appMigrations/appMigrationMetadata.ts
@@ -1,4 +1,4 @@
-import { Duration, cache, context, db, env } from "@budibase/backend-core"
+import { Duration, cache, db, env } from "@budibase/backend-core"
 import { Database, DocumentType, Document } from "@budibase/types"
 
 export interface AppMigrationDoc extends Document {
@@ -42,7 +42,10 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
     version = ""
   }
 
-  await cache.store(cacheKey, version, EXPIRY_SECONDS)
+  // only cache if we have a valid version
+  if (version) {
+    await cache.store(cacheKey, version, EXPIRY_SECONDS)
+  }
 
   return version
 }
@@ -54,8 +57,7 @@ export async function updateAppMigrationMetadata({
   appId: string
   version: string
 }): Promise<void> {
-  const db = context.getAppDB()
-
+  const appDb = db.getDB(appId)
   let appMigrationDoc: AppMigrationDoc
 
   try {
@@ -70,7 +72,7 @@ export async function updateAppMigrationMetadata({
       version: "",
       history: {},
     }
-    await db.put(appMigrationDoc)
+    await appDb.put(appMigrationDoc)
     appMigrationDoc = await getFromDB(appId)
   }
 
@@ -82,7 +84,7 @@ export async function updateAppMigrationMetadata({
       [version]: { runAt: new Date().toISOString() },
     },
   }
-  await db.put(updatedMigrationDoc)
+  await appDb.put(updatedMigrationDoc)
 
   const cacheKey = getCacheKey(appId)
 
diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index 89c71ae26f..a24bf9c0a3 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -16,7 +16,10 @@ export type AppMigration = {
 
 export function getLatestEnabledMigrationId(migrations?: AppMigration[]) {
   let latestMigrationId: string | undefined
-  for (let migration of migrations || MIGRATIONS) {
+  if (!migrations) {
+    migrations = MIGRATIONS
+  }
+  for (let migration of migrations) {
     // if a migration is disabled, all migrations after it are disabled
     if (migration.disabled) {
       break