@budibase/server 0.9.185-alpha.1 → 0.9.185-alpha.13

package/dist/api/controllers/application.js

@@ -27,6 +27,8 @@ const { getAllLocks } = require("../../utilities/redis");
 const { updateClientLibrary, backupClientLibrary, revertClientLibrary, } = require("../../utilities/fileSystem/clientLibrary");
 const { getTenantId, isMultiTenant } = require("@budibase/auth/tenancy");
 const { syncGlobalUsers } = require("./user");
+const { app: appCache } = require("@budibase/auth/cache");
+const { cleanupAutomations } = require("../../automations/utils");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
 function getLayouts(db) {
@@ -214,6 +216,7 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (!env.isTest()) {
         yield createApp(appId);
     }
+    yield appCache.invalidateAppMetadata(appId, newApplication);
     ctx.status = 200;
     ctx.body = newApplication;
 });
@@ -268,8 +271,12 @@ exports.delete = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (!env.isTest() && !ctx.query.unpublish) {
         yield deleteApp(ctx.params.appId);
     }
+    if (ctx.query && ctx.query.unpublish) {
+        yield cleanupAutomations(ctx.params.appId);
+    }
     // make sure the app/role doesn't stick around after the app has been deleted
     yield removeAppFromUserRoles(ctx, ctx.params.appId);
+    yield appCache.invalidateAppMetadata(ctx.params.appId);
     ctx.status = 200;
     ctx.body = result;
 });
@@ -331,7 +338,10 @@ const updateAppPackage = (ctx, appPackage, appId) => __awaiter(void 0, void 0, v
     // the locked by property is attached by server but generated from
     // Redis, shouldn't ever store it
     delete newAppPackage.lockedBy;
-    return yield db.put(newAppPackage);
+    const response = yield db.put(newAppPackage);
+    // remove any cached metadata, so that it will be updated
+    yield appCache.invalidateAppMetadata(appId);
+    return response;
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = new CouchDB(app.appId);

package/dist/api/controllers/datasource.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../../db");
 const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentTypes, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
-const { BuildSchemaErrors } = require("../../constants");
+const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
 exports.fetch = function (ctx) {
@@ -97,8 +97,12 @@ exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         // Delete all queries for the datasource
-        const rows = yield db.allDocs(getQueryParams(ctx.params.datasourceId, null));
-        yield db.bulkDocs(rows.rows.map(row => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
+        const queries = yield db.allDocs(getQueryParams(ctx.params.datasourceId, null));
+        yield db.bulkDocs(queries.rows.map(row => ({
+            _id: row.id,
+            _rev: row.value.rev,
+            _deleted: true,
+        })));
         // delete the datasource
         yield db.remove(ctx.params.datasourceId, ctx.params.revId);
         ctx.message = `Datasource deleted.`;
@@ -123,6 +127,21 @@ exports.query = function (ctx) {
         }
     });
 };
+function getErrorTables(errors, errorType) {
+    return Object.entries(errors)
+        .filter(entry => entry[1] === errorType)
+        .map(([name]) => name);
+}
+function updateError(error, newError, tables) {
+    if (!error) {
+        error = "";
+    }
+    if (error.length > 0) {
+        error += "\n";
+    }
+    error += `${newError} ${tables.join(", ")}`;
+    return error;
+}
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
     const Connector = integrations[datasource.source];
     // Connect to the DB and build the schema
@@ -142,10 +161,15 @@ const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, func
     const errors = connector.schemaErrors;
     let error = null;
     if (errors && Object.keys(errors).length > 0) {
-        const noKeyTables = Object.entries(errors)
-            .filter(entry => entry[1] === BuildSchemaErrors.NO_KEY)
-            .map(([name]) => name);
-        error = `No primary key constraint found for the following: ${noKeyTables.join(", ")}`;
+        const noKey = getErrorTables(errors, BuildSchemaErrors.NO_KEY);
+        const invalidCol = getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN);
+        if (noKey.length) {
+            error = updateError(error, "No primary key constraint found for the following:", noKey);
+        }
+        if (invalidCol.length) {
+            const invalidCols = Object.values(InvalidColumns).join(", ");
+            error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
+        }
     }
     return { tables: connector.tables, error };
 });

package/dist/api/controllers/deploy/index.js

@@ -13,6 +13,7 @@ const Deployment = require("./Deployment");
 const { Replication, getDeployedAppID } = require("@budibase/auth/db");
 const { DocumentTypes, getAutomationParams } = require("../../../db/utils");
 const { disableAllCrons, enableCronTrigger, } = require("../../../automations/utils");
+const { app: appCache } = require("@budibase/auth/cache");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
 const DeploymentStatus = {
@@ -95,6 +96,7 @@ function deployApp(deployment) {
             appDoc.appId = productionAppId;
             appDoc.instance._id = productionAppId;
             yield db.put(appDoc);
+            yield appCache.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");
             yield initDeployedApp(productionAppId);
             console.log("Deployed app initialised, setting deployment to successful");

package/dist/api/controllers/dev.js

@@ -16,6 +16,7 @@ const { request } = require("../../utilities/workerRequests");
 const { clearLock } = require("../../utilities/redis");
 const { Replication } = require("@budibase/auth").db;
 const { DocumentTypes } = require("../../db/utils");
+const { app: appCache } = require("@budibase/auth/cache");
 function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;
@@ -25,7 +26,8 @@ function redirect(ctx, method, path = "global") {
             body: ctx.request.body,
         }, true));
         if (response.status !== 200) {
-            ctx.throw(response.status, response.statusText);
+            const err = yield response.text();
+            ctx.throw(400, err);
         }
         const cookie = response.headers.get("set-cookie");
         if (cookie) {
@@ -102,6 +104,7 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         appDoc.appId = appId;
         appDoc.instance._id = appId;
         yield db.put(appDoc);
+        yield appCache.invalidateAppMetadata(appId);
         ctx.body = {
             message: "Reverted changes successfully.",
         };

package/dist/api/controllers/query.js

@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { processString } = require("@budibase/string-templates");
 const CouchDB = require("../../db");
 const { generateQueryID, getQueryParams } = require("../../db/utils");
-const { integrations } = require("../../integrations");
 const { BaseQueryVerbs } = require("../../constants");
 const env = require("../../environment");
-const ScriptRunner = require("../../utilities/scriptRunner");
+const { Thread, ThreadType } = require("../../threads");
+const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
     const wasArray = Array.isArray(input);
@@ -26,38 +26,6 @@ function enrichQueries(input) {
     }
     return wasArray ? queries : queries[0];
 }
-function formatResponse(resp) {
-    if (typeof resp === "string") {
-        try {
-            resp = JSON.parse(resp);
-        }
-        catch (err) {
-            resp = { response: resp };
-        }
-    }
-    return resp;
-}
-function runAndTransform(integration, queryVerb, enrichedQuery, transformer) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let rows = formatResponse(yield integration[queryVerb](enrichedQuery));
-        // transform as required
-        if (transformer) {
-            const runner = new ScriptRunner(transformer, { data: rows });
-            rows = runner.execute();
-        }
-        // needs to an array for next step
-        if (!Array.isArray(rows)) {
-            rows = [rows];
-        }
-        // map into JSON if just raw primitive here
-        if (rows.find(row => typeof row !== "object")) {
-            rows = rows.map(value => ({ value }));
-        }
-        // get all the potential fields in the schema
-        let keys = rows.flatMap(Object.keys);
-        return { rows, keys };
-    });
-}
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
@@ -135,21 +103,22 @@ exports.preview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         const datasource = yield db.get(ctx.request.body.datasourceId);
-        const Integration = integrations[datasource.source];
-        if (!Integration) {
-            ctx.throw(400, "Integration type does not exist.");
-        }
         const { fields, parameters, queryVerb, transformer } = ctx.request.body;
         const enrichedQuery = yield enrichQueryFields(fields, parameters);
-        const integration = new Integration(datasource.config);
-        const { rows, keys } = yield runAndTransform(integration, queryVerb, enrichedQuery, transformer);
-        ctx.body = {
-            rows,
-            schemaFields: [...new Set(keys)],
-        };
-        // cleanup
-        if (integration.end) {
-            integration.end();
+        try {
+            const { rows, keys } = yield Runner.run({
+                datasource,
+                queryVerb,
+                query: enrichedQuery,
+                transformer,
+            });
+            ctx.body = {
+                rows,
+                schemaFields: [...new Set(keys)],
+            };
+        }
+        catch (err) {
+            ctx.throw(400, err);
         }
     });
 };
@@ -158,18 +127,19 @@ exports.execute = function (ctx) {
         const db = new CouchDB(ctx.appId);
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
-        const Integration = integrations[datasource.source];
-        if (!Integration) {
-            ctx.throw(400, "Integration type does not exist.");
-        }
         const enrichedQuery = yield enrichQueryFields(query.fields, ctx.request.body.parameters);
-        const integration = new Integration(datasource.config);
         // call the relevant CRUD method on the integration class
-        const { rows } = yield runAndTransform(integration, query.queryVerb, enrichedQuery, query.transformer);
-        ctx.body = rows;
-        // cleanup
-        if (integration.end) {
-            integration.end();
+        try {
+            const { rows } = yield Runner.run({
+                datasource,
+                queryVerb: query.queryVerb,
+                query: enrichedQuery,
+                transformer: query.transformer,
+            });
+            ctx.body = rows;
+        }
+        catch (err) {
+            ctx.throw(400, err);
         }
     });
 };

package/dist/api/controllers/user.js

@@ -94,6 +94,7 @@ exports.syncUser = function (ctx) {
                 .map(([appId]) => appId);
         }
         for (let prodAppId of prodAppIds) {
+            const roleId = roles[prodAppId];
             const devAppId = getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
                 if (!(yield doesDatabaseExist(appId))) {
@@ -113,14 +114,17 @@ exports.syncUser = function (ctx) {
                         tableId: InternalTables.USER_METADATA,
                     };
                 }
-                let combined;
-                if (deleting) {
-                    combined = Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
+                // assign the roleId for the metadata doc
+                if (roleId) {
+                    metadata.roleId = roleId;
                 }
-                else {
-                    combined = combineMetadataAndUser(user, metadata);
+                let combined = !deleting
+                    ? combineMetadataAndUser(user, metadata)
+                    : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
+                // if its null then there was no updates required
+                if (combined) {
+                    yield db.put(combined);
                 }
-                yield db.put(combined);
             }
         }
         ctx.body = {

package/dist/api/routes/query.js

@@ -41,7 +41,7 @@ router
     .get("/api/queries", authorized(BUILDER), queryController.fetch)
     .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)
     .post("/api/queries/preview", bodyResource("datasourceId"), authorized(BUILDER), generateQueryPreviewValidation(), queryController.preview)
-    .get("/api/queries/:queryId", authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
+    .get("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
     .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.execute)
     .delete("/api/queries/:queryId/:revId", paramResource("queryId"), authorized(BUILDER), queryController.destroy);
 module.exports = router;

package/dist/app.js

@@ -41,17 +41,8 @@ app.use(pino({
     level: env.LOG_LEVEL || "error",
 }));
 if (!env.isTest()) {
-    const bullApp = bullboard.init();
-    app.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-        if (ctx.path.startsWith(bullboard.pathPrefix)) {
-            ctx.status = 200;
-            ctx.respond = false;
-            bullApp(ctx.req, ctx.res);
-        }
-        else {
-            yield next();
-        }
-    }));
+    const plugin = bullboard.init();
+    app.use(plugin);
 }
 app.context.eventEmitter = eventEmitter;
 app.context.auth = {};

package/dist/automations/bullboard.js

@@ -1,7 +1,16 @@
 "use strict";
-const { createBullBoard } = require("bull-board");
-const { BullAdapter } = require("bull-board/bullAdapter");
-const express = require("express");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const { createBullBoard } = require("@bull-board/api");
+const { BullAdapter } = require("@bull-board/api/bullAdapter");
+const { KoaAdapter } = require("@bull-board/koa");
 const env = require("../environment");
 const Queue = env.isTest()
     ? require("../utilities/queue/inMemoryQueue")
@@ -9,19 +18,37 @@ const Queue = env.isTest()
 const { JobQueues } = require("../constants");
 const { utils } = require("@budibase/auth/redis");
 const { opts, redisProtocolUrl } = utils.getRedisOptions();
-const redisConfig = redisProtocolUrl || { redis: opts };
-let automationQueue = new Queue(JobQueues.AUTOMATIONS, redisConfig);
-exports.pathPrefix = "/bulladmin";
+const CLEANUP_PERIOD_MS = 60 * 1000;
+const queueConfig = redisProtocolUrl || { redis: opts };
+let cleanupInternal = null;
+let automationQueue = new Queue(JobQueues.AUTOMATIONS, queueConfig);
+function cleanup() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield automationQueue.clean(CLEANUP_PERIOD_MS, "completed");
+    });
+}
+const PATH_PREFIX = "/bulladmin";
 exports.init = () => {
-    const expressApp = express();
+    // cleanup the events every 5 minutes
+    if (!cleanupInternal) {
+        cleanupInternal = setInterval(cleanup, CLEANUP_PERIOD_MS);
+        // fire off an initial cleanup
+        cleanup().catch(err => {
+            console.error(`Unable to cleanup automation queue initially - ${err}`);
+        });
+    }
     // Set up queues for bull board admin
     const queues = [automationQueue];
     const adapters = [];
+    const serverAdapter = new KoaAdapter();
     for (let queue of queues) {
         adapters.push(new BullAdapter(queue));
     }
-    const { router } = createBullBoard(adapters);
-    expressApp.use(exports.pathPrefix, router);
-    return expressApp;
+    createBullBoard({
+        queues: adapters,
+        serverAdapter,
+    });
+    serverAdapter.setBasePath(PATH_PREFIX);
+    return serverAdapter.registerPlugin();
 };
 exports.queue = automationQueue;

package/dist/automations/triggers.js

@@ -20,6 +20,10 @@ const { checkTestFlag } = require("../utilities/redis");
 const utils = require("./utils");
 const env = require("../environment");
 const TRIGGER_DEFINITIONS = definitions;
+const JOB_OPTS = {
+    removeOnComplete: true,
+    removeOnFail: true,
+};
 function queueRelevantRowAutomations(event, eventType) {
     return __awaiter(this, void 0, void 0, function* () {
         if (event.appId == null) {
@@ -47,7 +51,7 @@ function queueRelevantRowAutomations(event, eventType) {
             }
             if (automationTrigger.inputs &&
                 automationTrigger.inputs.tableId === event.row.tableId) {
-                yield queue.add({ automation, event });
+                yield queue.add({ automation, event }, JOB_OPTS);
             }
         }
     });
@@ -85,7 +89,7 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
             automation.definition.trigger != null &&
             automation.definition.trigger.stepId === definitions.APP.stepId &&
             automation.definition.trigger.stepId === "APP" &&
-            !checkTestFlag(automation._id)) {
+            !(yield checkTestFlag(automation._id))) {
             // values are likely to be submitted as strings, so we shall convert to correct type
             const coercedFields = {};
             const fields = automation.definition.trigger.inputs.fields;
@@ -99,7 +103,7 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
             return utils.processEvent({ data });
         }
         else {
-            return queue.add(data);
+            return queue.add(data, JOB_OPTS);
         }
     });
 };

package/dist/automations/utils.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const runner = require("./thread");
+const { Thread, ThreadType } = require("../threads");
 const { definitions } = require("./triggerInfo");
 const webhooks = require("../api/controllers/webhook");
 const CouchDB = require("../db");
@@ -19,10 +19,11 @@ const { MetadataTypes } = require("../constants");
 const { getDeployedAppID } = require("@budibase/auth/db");
 const WH_STEP_ID = definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = definitions.CRON.stepId;
+const Runner = new Thread(ThreadType.AUTOMATION);
 exports.processEvent = (job) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         // need to actually await these so that an error can be captured properly
-        return yield runner(job);
+        return yield Runner.run(job);
     }
     catch (err) {
         console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${err}`);
@@ -146,3 +147,11 @@ exports.checkForWebhooks = ({ appId, oldAuto, newAuto }) => __awaiter(void 0, vo
     }
     return newAuto;
 });
+/**
+ * When removing an app/unpublishing it need to make sure automations are cleaned up (cron).
+ * @param appId {string} the app that is being removed.
+ * @return {Promise<void>} clean is complete if this succeeds.
+ */
+exports.cleanupAutomations = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    yield exports.disableAllCrons(appId);
+});

package/dist/constants/index.js

@@ -150,8 +150,14 @@ exports.MetadataTypes = {
     AUTOMATION_TEST_INPUT: "automationTestInput",
     AUTOMATION_TEST_HISTORY: "automationTestHistory",
 };
+exports.InvalidColumns = {
+    ID: "_id",
+    REV: "_rev",
+    TABLE_ID: "tableId",
+};
 exports.BuildSchemaErrors = {
     NO_KEY: "no_key",
+    INVALID_COLUMN: "invalid_column",
 };
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = ObjectStoreBuckets;

package/dist/integrations/base/IntegrationBase.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/integrations/base/sql.js

@@ -17,19 +17,46 @@ const datasource_1 = require("../../definitions/datasource");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
 const BASE_LIMIT = 5000;
+// these are invalid dates sent by the client, need to convert them to a real max date
+const MIN_ISO_DATE = "0000-00-00T00:00:00.000Z";
+const MAX_ISO_DATE = "9999-00-00T00:00:00.000Z";
+function parse(input) {
+    if (Array.isArray(input)) {
+        return JSON.stringify(input);
+    }
+    if (typeof input !== "string") {
+        return input;
+    }
+    if (input === MAX_ISO_DATE) {
+        return new Date(8640000000000000);
+    }
+    if (input === MIN_ISO_DATE) {
+        return new Date(-8640000000000000);
+    }
+    if (utils_1.isIsoDateString(input)) {
+        return new Date(input);
+    }
+    return input;
+}
 function parseBody(body) {
     for (let [key, value] of Object.entries(body)) {
-        if (Array.isArray(value)) {
-            body[key] = JSON.stringify(value);
-        }
-        if (typeof value !== "string") {
-            continue;
+        body[key] = parse(value);
+    }
+    return body;
+}
+function parseFilters(filters) {
+    for (let [key, value] of Object.entries(filters)) {
+        let parsed;
+        if (typeof value === "object") {
+            parsed = parseFilters(value);
         }
-        if (utils_1.isIsoDateString(value)) {
-            body[key] = new Date(value);
+        else {
+            parsed = parse(value);
         }
+        // @ts-ignore
+        filters[key] = parsed;
     }
-    return body;
+    return filters;
 }
 class InternalBuilder {
     constructor(client) {
@@ -45,6 +72,7 @@ class InternalBuilder {
         if (!filters) {
             return query;
         }
+        filters = parseFilters(filters);
         // if all or specified in filters, then everything is an or
         const allOr = filters.allOr;
         if (filters.oneOf) {

package/dist/integrations/mysql.js

@@ -147,7 +147,9 @@ var MySQLModule;
             });
         }
         read(query) {
-            return internalQuery(this.client, utils_1.getSqlQuery(query));
+            return __awaiter(this, void 0, void 0, function* () {
+                return internalQuery(this.client, utils_1.getSqlQuery(query));
+            });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClients = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
-const { FieldTypes, BuildSchemaErrors } = require("../constants");
+const { FieldTypes, BuildSchemaErrors, InvalidColumns } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
 const SQL_TYPE_MAP = {
@@ -151,14 +151,20 @@ function copyExistingPropsOver(tableName, table, entities) {
     return table;
 }
 function finaliseExternalTables(tables, entities) {
+    const invalidColumns = Object.values(InvalidColumns);
     const finalTables = {};
     const errors = {};
     for (let [name, table] of Object.entries(tables)) {
+        const schemaFields = Object.keys(table.schema);
         // make sure every table has a key
         if (table.primary == null || table.primary.length === 0) {
             errors[name] = BuildSchemaErrors.NO_KEY;
             continue;
         }
+        else if (schemaFields.find(field => invalidColumns.includes(field))) {
+            errors[name] = BuildSchemaErrors.INVALID_COLUMN;
+            continue;
+        }
         // make sure all previous props have been added back
         finalTables[name] = copyExistingPropsOver(name, table, entities);
     }

package/dist/middleware/builder.js

@@ -13,6 +13,7 @@ const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require(".
 const CouchDB = require("../db");
 const { DocumentTypes } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/auth/permissions");
+const { app: appCache } = require("@budibase/auth/cache");
 const DEBOUNCE_TIME_SEC = 30;
 /************************************************** *
  * This middleware has been broken out of the       *
@@ -51,7 +52,9 @@ function updateAppUpdatedAt(ctx) {
         const db = new CouchDB(appId);
         const metadata = yield db.get(DocumentTypes.APP_METADATA);
         metadata.updatedAt = new Date().toISOString();
-        yield db.put(metadata);
+        const response = yield db.put(metadata);
+        metadata._rev = response.rev;
+        yield appCache.invalidateAppMetadata(appId, metadata);
         // set a new debounce record with a short TTL
         yield setDebounce(appId, DEBOUNCE_TIME_SEC);
     });