@budibase/server 1.0.151-alpha.2 → 1.0.153

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

@@ -41,10 +41,10 @@ function patch(ctx) {
         const body = ctx.request.body;
         // if it doesn't have an _id then its save
         if (body && !body._id) {
-            return save(ctx);
+            return (0, exports.save)(ctx);
         }
         try {
-            const { row, table } = yield pickApi(tableId).patch(ctx);
+            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx));
             ctx.status = 200;
             ctx.eventEmitter &&
                 ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
@@ -57,7 +57,7 @@ function patch(ctx) {
     });
 }
 exports.patch = patch;
-const saveRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+const save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = ctx.appId;
     const tableId = getTableId(ctx);
     const body = ctx.request.body;
@@ -66,7 +66,7 @@ const saveRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         return patch(ctx);
     }
     try {
-        const { row, table } = yield pickApi(tableId).save(ctx);
+        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx)));
         ctx.status = 200;
         ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table);
         ctx.message = `${table.name} saved successfully`;
@@ -76,17 +76,12 @@ const saveRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.throw(400, err);
     }
 });
-function save(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield pro_1.quotas.addRow(() => saveRow(ctx));
-    });
-}
 exports.save = save;
 function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pickApi(tableId).fetchView(ctx);
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -98,7 +93,7 @@ function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pickApi(tableId).fetch(ctx);
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -110,7 +105,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pickApi(tableId).find(ctx);
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -125,7 +120,7 @@ function destroy(ctx) {
         const tableId = getTableId(ctx);
         let response, row;
         if (inputs.rows) {
-            let { rows } = yield pickApi(tableId).bulkDestroy(ctx);
+            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx));
             yield pro_1.quotas.removeRows(rows.length);
             response = rows;
             for (let row of rows) {
@@ -133,7 +128,7 @@ function destroy(ctx) {
             }
         }
         else {
-            let resp = yield pickApi(tableId).destroy(ctx);
+            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx));
             yield pro_1.quotas.removeRow();
             response = resp.response;
             row = resp.row;
@@ -151,7 +146,7 @@ function search(ctx) {
         const tableId = getTableId(ctx);
         try {
             ctx.status = 200;
-            ctx.body = yield pickApi(tableId).search(ctx);
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -175,7 +170,7 @@ function fetchEnrichedRow(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pickApi(tableId).fetchEnrichedRow(ctx);
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx));
         }
         catch (err) {
             ctx.throw(400, err);
@@ -186,7 +181,7 @@ exports.fetchEnrichedRow = fetchEnrichedRow;
 const exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const tableId = getTableId(ctx);
     try {
-        ctx.body = yield pickApi(tableId).exportRows(ctx);
+        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx));
     }
     catch (err) {
         ctx.throw(400, err);

package/dist/api/controllers/view/exporters.js

@@ -6,7 +6,7 @@ exports.csv = function (headers, rows) {
             .map(header => {
             let val = row[header];
             val =
-                typeof val === "object" && !(val instanceof Date)
+                typeof val === "object"
                     ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
                     : `"${val}"`;
             return val.trim();

package/dist/automations/steps/queryRows.js

@@ -57,7 +57,6 @@ exports.definition = {
                 limit: {
                     type: "number",
                     title: "Limit",
-                    customType: "queryLimit",
                 },
             },
             required: ["tableId"],

package/dist/constants/index.js

@@ -185,5 +185,9 @@ exports.AutomationErrors = {
     MAX_ITERATIONS: "MAX_ITERATIONS_REACHED",
     FAILURE_CONDITION: "FAILURE_CONDITION_MET",
 };
+exports.LoopStepTypes = {
+    ARRAY: "Array",
+    STRING: "String",
+};
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = ObjectStoreBuckets;

package/dist/integrations/base/sql.js

@@ -24,6 +24,30 @@ const BASE_LIMIT = envLimit || 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 likeKey(client, key) {
+    if (!key.includes(" ")) {
+        return key;
+    }
+    let start, end;
+    switch (client) {
+        case utils_1.SqlClients.MY_SQL:
+            start = end = "`";
+            break;
+        case utils_1.SqlClients.ORACLE:
+        case utils_1.SqlClients.POSTGRES:
+            start = end = '"';
+            break;
+        case utils_1.SqlClients.MS_SQL:
+            start = "[";
+            end = "]";
+            break;
+        default:
+            throw "Unknown client";
+    }
+    const parts = key.split(".");
+    key = parts.map(part => `${start}${part}${end}`).join(".");
+    return key;
+}
 function parse(input) {
     if (Array.isArray(input)) {
         return JSON.stringify(input);
@@ -118,7 +142,9 @@ class InternalBuilder {
                 else {
                     const rawFnc = `${fnc}Raw`;
                     // @ts-ignore
-                    query = query[rawFnc](`LOWER(${key}) LIKE ?`, [`%${value}%`]);
+                    query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
+                        `%${value}%`,
+                    ]);
                 }
             });
         }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.151-alpha.1",
+    "version": "1.0.152",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -10,6 +10,7 @@
     },
     "scripts": {
         "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
+        "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
         "test": "jest --coverage --maxWorkers=2",
         "test:watch": "jest --watch",
@@ -68,10 +69,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.151-alpha.1",
-        "@budibase/client": "^1.0.151-alpha.1",
-        "@budibase/pro": "1.0.151-alpha.1",
-        "@budibase/string-templates": "^1.0.151-alpha.1",
+        "@budibase/backend-core": "^1.0.152",
+        "@budibase/client": "^1.0.152",
+        "@budibase/pro": "1.0.152",
+        "@budibase/string-templates": "^1.0.152",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -18,13 +18,46 @@ const { DocumentTypes } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const { AutomationErrors } = require("../constants");
+const { AutomationErrors, LoopStepTypes } = require("../constants");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerDefs.CRON.stepId;
 const STOPPED_STATUS = { success: false, status: "STOPPED" };
 const { cloneDeep } = require("lodash/fp");
 const env = require("../environment");
+function typecastForLooping(loopStep, input) {
+    if (!input || !input.binding) {
+        return null;
+    }
+    const isArray = Array.isArray(input.binding), isString = typeof input.binding === "string";
+    try {
+        switch (loopStep.inputs.option) {
+            case LoopStepTypes.ARRAY:
+                if (isString) {
+                    return JSON.parse(input.binding);
+                }
+                break;
+            case LoopStepTypes.STRING:
+                if (isArray) {
+                    return input.binding.join(",");
+                }
+                break;
+        }
+    }
+    catch (err) {
+        throw new Error("Unable to cast to correct type");
+    }
+    return input.binding;
+}
+function getLoopIterations(loopStep, input) {
+    const binding = typecastForLooping(loopStep, input);
+    if (!loopStep || !binding) {
+        return 1;
+    }
+    return Array.isArray(binding)
+        ? binding.length
+        : automationUtils.stringSplit(binding).length;
+}
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -95,7 +128,7 @@ class Orchestrator {
         this._context.steps.splice(loopStepNumber, 0, Object.assign(Object.assign({}, output), { success: result.success, status: result.status }));
     }
     execute() {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
@@ -106,7 +139,7 @@ class Orchestrator {
             let loopSteps = [];
             for (let step of automation.definition.steps) {
                 stepCount++;
-                let input;
+                let input, iterations = 1, iterationCount = 0;
                 if (step.stepId === LOOP_STEP_ID) {
                     loopStep = step;
                     loopStepNumber = stepCount;
@@ -114,24 +147,18 @@ class Orchestrator {
                 }
                 if (loopStep) {
                     input = yield processObject(loopStep.inputs, this._context);
+                    iterations = getLoopIterations(loopStep, input);
                 }
-                let iterations = loopStep
-                    ? Array.isArray(input.binding)
-                        ? input.binding.length
-                        : automationUtils.stringSplit(input.binding).length
-                    : 1;
-                let iterationCount = 0;
                 for (let index = 0; index < iterations; index++) {
                     let originalStepInput = cloneDeep(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep) {
                         let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
-                        newInput = automationUtils.cleanInputValues(newInput, loopStep.schema.inputs);
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
-                        if ((loopStep.inputs.option === "Array" &&
-                            !Array.isArray(newInput.binding)) ||
-                            (loopStep.inputs.option === "String" &&
-                                typeof newInput.binding !== "string")) {
+                        try {
+                            newInput.binding = typecastForLooping(loopStep, newInput);
+                        }
+                        catch (err) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.INCORRECT_TYPE,
                                 success: false,
@@ -179,16 +206,14 @@ class Orchestrator {
                             break;
                         }
                         let isFailure = false;
-                        if (typeof ((_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem) === "object") {
-                            isFailure = Object.keys(this._context.steps[loopStepNumber].currentItem).some(value => {
-                                return (this._context.steps[loopStepNumber].currentItem[value] ===
-                                    loopStep.inputs.failure);
+                        const currentItem = (_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem;
+                        if (currentItem && typeof currentItem === "object") {
+                            isFailure = Object.keys(currentItem).some(value => {
+                                return currentItem[value] === loopStep.inputs.failure;
                             });
                         }
                         else {
-                            isFailure =
-                                ((_b = this._context.steps[loopStepNumber]) === null || _b === void 0 ? void 0 : _b.currentItem) ===
-                                    loopStep.inputs.failure;
+                            isFailure = currentItem && currentItem === loopStep.inputs.failure;
                         }
                         if (isFailure) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {