From 0f0290411e59cccf592b80848a381a7d555605e8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 26 Apr 2022 14:58:59 +0100
Subject: [PATCH] Fixing issue discovered by test case.

---
 packages/server/src/api/controllers/table/internal.js | 2 +-
 packages/server/src/api/routes/tests/routing.spec.js  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/table/internal.js b/packages/server/src/api/controllers/table/internal.js
index 412f644059..7a43bdaf15 100644
--- a/packages/server/src/api/controllers/table/internal.js
+++ b/packages/server/src/api/controllers/table/internal.js
@@ -24,7 +24,7 @@ function checkAutoColumns(table, oldTable) {
     if (!schema.autocolumn || schema.subtype) {
       continue
     }
-    const oldSchema = oldTable.schema[key]
+    const oldSchema = oldTable && oldTable.schema[key]
     if (oldSchema && oldSchema.subtype) {
       table.schema[key].subtype = oldSchema.subtype
     } else {
diff --git a/packages/server/src/api/routes/tests/routing.spec.js b/packages/server/src/api/routes/tests/routing.spec.js
index d6d05c3322..1c3abf2457 100644
--- a/packages/server/src/api/routes/tests/routing.spec.js
+++ b/packages/server/src/api/routes/tests/routing.spec.js
@@ -2,7 +2,6 @@ const setup = require("./utilities")
 const { basicScreen } = setup.structures
 const { checkBuilderEndpoint, runInProd } = require("./utilities/TestFunctions")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { doInAppContext } = require("@budibase/backend-core/context")
 
 const route = "/test"