@budibase/server 1.0.92 → 1.0.95

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.91",
+    "version": "1.0.94",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,9 +71,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.91",
-        "@budibase/client": "^1.0.91",
-        "@budibase/string-templates": "^1.0.91",
+        "@budibase/backend-core": "^1.0.94",
+        "@budibase/client": "^1.0.94",
+        "@budibase/string-templates": "^1.0.94",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -9,15 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 require("./utils").threadSetup();
-const env = require("../environment");
 const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
 const { processObject } = require("@budibase/string-templates");
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants");
-const { DocumentTypes, isDevAppID } = require("../db/utils");
+const { DocumentTypes } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
-const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
@@ -123,10 +121,6 @@ class Orchestrator {
                     return err;
                 }
             }
-            // Increment quota for automation runs
-            if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-                yield usage.update(usage.Properties.AUTOMATION, 1);
-            }
             return this.executionOutput;
         });
     }

package/dist/threads/query.js

@@ -38,10 +38,11 @@ class QueryRunner {
             return fields;
         }
         const bindings = findHBSBlocks(sql);
-        let variables = [];
+        let variables = [], arrays = [];
         for (let binding of bindings) {
-            let variable = integration.getBindingIdentifier();
-            variables.push(binding);
+            // look for array/list operations in the SQL statement, which will need handled later
+            const listRegex = new RegExp(`(in|IN|In|iN)( )+${binding}`);
+            const listRegexMatch = sql.match(listRegex);
             // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
             const charConstRegex = new RegExp(`'[^']*${binding}[^']*'`);
             const charConstMatch = sql.match(charConstRegex);
@@ -49,15 +50,41 @@ class QueryRunner {
                 let [part1, part2] = charConstMatch[0].split(binding);
                 part1 = `'${part1.substring(1)}'`;
                 part2 = `'${part2.substring(0, part2.length - 1)}'`;
-                sql = sql.replace(charConstMatch[0], integration.getStringConcat([part1, variable, part2]));
+                sql = sql.replace(charConstMatch[0], integration.getStringConcat([
+                    part1,
+                    integration.getBindingIdentifier(),
+                    part2,
+                ]));
+            }
+            // generate SQL parameterised array
+            else if (listRegexMatch) {
+                arrays.push(binding);
+                // determine the length of the array
+                const value = this.enrichQueryFields([binding], parameters)[0].split(",");
+                // build a string like ($1, $2, $3)
+                sql = sql.replace(binding, `(${Array.apply(null, Array(value.length))
+                    .map(() => integration.getBindingIdentifier())
+                    .join(",")})`);
             }
             else {
-                sql = sql.replace(binding, variable);
+                sql = sql.replace(binding, integration.getBindingIdentifier());
             }
+            variables.push(binding);
         }
         // replicate the knex structure
         fields.sql = sql;
         fields.bindings = this.enrichQueryFields(variables, parameters);
+        // check for arrays in the data
+        let updated = [];
+        for (let i = 0; i < variables.length; i++) {
+            if (arrays.includes(variables[i])) {
+                updated = updated.concat(fields.bindings[i].split(","));
+            }
+            else {
+                updated.push(fields.bindings[i]);
+            }
+        }
+        fields.bindings = updated;
         return fields;
     }
     execute() {