@budibase/server 0.9.185-alpha.10 → 0.9.185-alpha.14

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) {
@@ -127,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
@@ -146,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/table/external.js

@@ -136,9 +136,13 @@ exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const table = ctx.request.body;
-        // can't do this
+        // can't do this right now
         delete table.dataImport;
         const datasourceId = getDatasourceId(ctx.request.body);
+        // table doesn't exist already, note that it is created
+        if (!table._id) {
+            table.created = true;
+        }
         let tableToSave = Object.assign({ type: "table", _id: buildExternalTableId(datasourceId, table.name) }, table);
         let oldTable;
         if (ctx.request.body && ctx.request.body._id) {
@@ -213,6 +217,9 @@ exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const tableToDelete = yield getTable(appId, ctx.params.tableId);
+        if (!tableToDelete || !tableToDelete.created) {
+            ctx.throw(400, "Cannot delete tables which weren't created in Budibase.");
+        }
         const datasourceId = getDatasourceId(tableToDelete);
         const db = new CouchDB(appId);
         const datasource = yield db.get(datasourceId);

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/environment.js

@@ -16,6 +16,7 @@ if (!LOADED && isDev() && !isTest()) {
     require("dotenv").config();
     LOADED = true;
 }
+let inThread = false;
 module.exports = {
     // important
     PORT: process.env.PORT,
@@ -55,6 +56,7 @@ module.exports = {
     USERID_API_KEY: process.env.USERID_API_KEY,
     DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
+    DISABLE_THREADING: process.env.DISABLE_THREADING,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;
@@ -65,7 +67,18 @@ module.exports = {
     isProd: () => {
         return !isDev();
     },
+    // used to check if already in a thread, don't thread further
+    setInThread: () => {
+        inThread = true;
+    },
+    isInThread: () => {
+        return inThread;
+    },
 };
+// threading can cause memory issues with node-ts in development
+if (isDev() && module.exports.DISABLE_THREADING == null) {
+    module.exports._set("DISABLE_THREADING", "1");
+}
 // clean up any environment variable edge cases
 for (let [key, value] of Object.entries(module.exports)) {
     // handle the edge case of "0" to disable an environment variable

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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.185-alpha.9",
+    "version": "0.9.185-alpha.13",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.185-alpha.9",
-        "@budibase/client": "^0.9.185-alpha.9",
-        "@budibase/string-templates": "^0.9.185-alpha.9",
+        "@budibase/auth": "^0.9.185-alpha.13",
+        "@budibase/client": "^0.9.185-alpha.13",
+        "@budibase/string-templates": "^0.9.185-alpha.13",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
@@ -16,7 +19,6 @@ const { DEFAULT_TENANT_ID } = require("@budibase/auth").constants;
 const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
 const { doInTenant } = require("@budibase/auth/tenancy");
-const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;

package/dist/threads/index.js

@@ -22,10 +22,16 @@ function typeToFile(type) {
 class Thread {
     constructor(type, opts = { timeoutMs: null, count: 1 }) {
         this.type = type;
-        if (!env.isTest()) {
+        this.count = opts.count ? opts.count : 1;
+        this.disableThreading =
+            env.isTest() ||
+                env.DISABLE_THREADING ||
+                this.count === 0 ||
+                env.isInThread();
+        if (!this.disableThreading) {
             const workerOpts = {
                 autoStart: true,
-                maxConcurrentWorkers: opts.count ? opts.count : 1,
+                maxConcurrentWorkers: this.count,
             };
             if (opts.timeoutMs) {
                 workerOpts.maxCallTime = opts.timeoutMs;
@@ -37,7 +43,7 @@ class Thread {
         return new Promise((resolve, reject) => {
             let fncToCall;
             // if in test then don't use threading
-            if (env.isTest()) {
+            if (this.disableThreading) {
                 fncToCall = require(typeToFile(this.type));
             }
             else {

package/dist/threads/query.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 function formatResponse(resp) {