@budibase/server 1.2.44-alpha.0 → 1.2.46

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

@@ -346,11 +346,25 @@ exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const table = yield db.get(ctx.params.tableId);
     const rowIds = ctx.request.body.rows;
     let format = ctx.query.format;
+    const { columns } = ctx.request.body;
     let response = (yield db.allDocs({
         include_docs: true,
         keys: rowIds,
     })).rows.map(row => row.doc);
-    let rows = yield outputProcessing(table, response);
+    let result = yield outputProcessing(table, response);
+    let rows = [];
+    // Filter data to only specified columns if required
+    if (columns && columns.length) {
+        for (let i = 0; i < result.length; i++) {
+            rows[i] = {};
+            for (let column of columns) {
+                rows[i][column] = result[i][column];
+            }
+        }
+    }
+    else {
+        rows = result;
+    }
     let headers = Object.keys(rows[0]);
     const exporter = exporters[format];
     const filename = `export.${format}`;

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

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { SearchIndexes } = require("../../../db/utils");
-const { removeKeyNumbering } = require("./utils");
 const fetch = require("node-fetch");
 const { getCouchInfo } = require("@budibase/backend-core/db");
 const { getAppId } = require("@budibase/backend-core/context");
@@ -19,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {}, notContains: {}, containsAny: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -105,14 +104,6 @@ class QueryBuilder {
         this.query.contains[key] = value;
         return this;
     }
-    addNotContains(key, value) {
-        this.query.notContains[key] = value;
-        return this;
-    }
-    addContainsAny(key, value) {
-        this.query.containsAny[key] = value;
-        return this;
-    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -155,27 +146,11 @@ class QueryBuilder {
             }
             return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
         };
-        const contains = (key, value, mode = "AND") => {
-            if (Array.isArray(value) && value.length === 0) {
+        const contains = (key, value) => {
+            if (!value && value !== 0) {
                 return null;
             }
-            if (!Array.isArray(value)) {
-                return `${key}:${value}`;
-            }
-            let statement = `${builder.preprocess(value[0], { escape: true })}`;
-            for (let i = 1; i < value.length; i++) {
-                statement += ` ${mode} ${builder.preprocess(value[i], {
-                    escape: true,
-                })}`;
-            }
-            return `${key}:(${statement})`;
-        };
-        const notContains = (key, value) => {
-            const allPrefix = allOr === "" ? "*:* AND" : "";
-            return allPrefix + "NOT " + contains(key, value);
-        };
-        const containsAny = (key, value) => {
-            return contains(key, value, "OR");
+            return `${key}:${builder.preprocess(value, { escape: true })}`;
         };
         const oneOf = (key, value) => {
             if (!Array.isArray(value)) {
@@ -194,8 +169,6 @@ class QueryBuilder {
         };
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
-                // check for new format - remove numbering if needed
-                key = removeKeyNumbering(key);
                 key = builder.preprocess(key.replace(/ /g, "_"), {
                     escape: true,
                 });
@@ -273,12 +246,6 @@ class QueryBuilder {
         if (this.query.contains) {
             build(this.query.contains, contains);
         }
-        if (this.query.notContains) {
-            build(this.query.notContains, notContains);
-        }
-        if (this.query.containsAny) {
-            build(this.query.containsAny, containsAny);
-        }
         // make sure table ID is always added as an AND
         if (tableId) {
             query = `(${query})`;
@@ -313,8 +280,6 @@ class QueryBuilder {
         });
     }
 }
-// exported for unit testing
-exports.QueryBuilder = QueryBuilder;
 /**
  * Executes a lucene search query.
  * @param url The query URL

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

@@ -13,9 +13,8 @@ const { cloneDeep } = require("lodash/fp");
 const { InternalTables } = require("../../../db/utils");
 const userController = require("../user");
 const { FieldTypes } = require("../../../constants");
+const { makeExternalQuery } = require("../../../integrations/base/utils");
 const { getAppDB } = require("@budibase/backend-core/context");
-const { makeExternalQuery } = require("../../../integrations/base/query");
-const { removeKeyNumbering } = require("../../../integrations/base/utils");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -25,7 +24,6 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
-exports.removeKeyNumbering = removeKeyNumbering;
 exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
     const datasourceId = json.endpoint.datasourceId;
     const db = getAppDB();

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
+exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveApp = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
@@ -19,7 +19,7 @@ const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
-const { upload, deleteFiles } = require("../../../utilities/fileSystem");
+const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
@@ -95,12 +95,6 @@ const uploadFile = function (ctx) {
     });
 };
 exports.uploadFile = uploadFile;
-const deleteObjects = function (ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
-    });
-};
-exports.deleteObjects = deleteObjects;
 const serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB({ skip_setup: true });

package/dist/api/controllers/table/external.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { buildExternalTableId, breakExternalTableId, } = require("../../../integrations/utils");
 const { getTable, generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
 const { DataSourceOperation, FieldTypes, RelationshipTypes, } = require("../../../constants");
-const { makeExternalQuery } = require("../../../integrations/base/query");
+const { makeExternalQuery } = require("../../../integrations/base/utils");
 const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");

package/dist/api/routes/static.js

@@ -68,10 +68,8 @@ router
     // TODO: for now this builder endpoint is not authorized/secured, will need to be
     .get("/builder/:file*", controller.serveBuilder)
     .post("/api/attachments/process", (0, authorized_1.default)(permissions_1.BUILDER), controller.uploadFile)
-    .post("/api/attachments/delete", (0, authorized_1.default)(permissions_1.BUILDER), controller.deleteObjects)
     .post("/api/beta/:feature", controller.toggleBetaUiFeature)
     .post("/api/attachments/:tableId/upload", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.WRITE), controller.uploadFile)
-    .post("/api/attachments/:tableId/delete", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.WRITE), controller.deleteObjects)
     .get("/:appId/:path*", controller.serveApp)
     .get("/app/:appUrl/:path*", controller.serveApp)
     .post("/api/attachments/:datasourceId/url", (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.READ), controller.getSignedUploadURL);

package/dist/automations/bullboard.js

@@ -18,10 +18,12 @@ const Queue = env.isTest()
 const { JobQueues } = require("../constants");
 const { utils } = require("@budibase/backend-core/redis");
 const { opts, redisProtocolUrl } = utils.getRedisOptions();
+const listeners = require("./listeners");
 const CLEANUP_PERIOD_MS = 60 * 1000;
 const queueConfig = redisProtocolUrl || { redis: opts };
 let cleanupInternal = null;
 let automationQueue = new Queue(JobQueues.AUTOMATIONS, queueConfig);
+listeners.addListeners(automationQueue);
 function cleanup() {
     return __awaiter(this, void 0, void 0, function* () {
         yield automationQueue.clean(CLEANUP_PERIOD_MS, "completed");

package/dist/automations/listeners.js

@@ -0,0 +1,102 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addListeners = void 0;
+const automation = __importStar(require("../threads/automation"));
+const addListeners = (queue) => {
+    logging(queue);
+    // handleStalled(queue)
+};
+exports.addListeners = addListeners;
+const handleStalled = (queue) => {
+    queue.on("active", (job) => __awaiter(void 0, void 0, void 0, function* () {
+        yield automation.removeStalled(job);
+    }));
+};
+const logging = (queue) => {
+    var _a;
+    if ((_a = process.env.NODE_DEBUG) === null || _a === void 0 ? void 0 : _a.includes("bull")) {
+        queue
+            .on("error", (error) => {
+            // An error occurred.
+            console.error(`automation-event=error error=${JSON.stringify(error)}`);
+        })
+            .on("waiting", (jobId) => {
+            // A Job is waiting to be processed as soon as a worker is idling.
+            console.log(`automation-event=waiting jobId=${jobId}`);
+        })
+            .on("active", (job, jobPromise) => {
+            // A job has started. You can use `jobPromise.cancel()`` to abort it.
+            console.log(`automation-event=active jobId=${job.id}`);
+        })
+            .on("stalled", (job) => {
+            // A job has been marked as stalled. This is useful for debugging job
+            // workers that crash or pause the event loop.
+            console.error(`automation-event=stalled jobId=${job.id} job=${JSON.stringify(job)}`);
+        })
+            .on("progress", (job, progress) => {
+            // A job's progress was updated!
+            console.log(`automation-event=progress jobId=${job.id} progress=${progress}`);
+        })
+            .on("completed", (job, result) => {
+            // A job successfully completed with a `result`.
+            console.log(`automation-event=completed jobId=${job.id} result=${result}`);
+        })
+            .on("failed", (job, err) => {
+            // A job failed with reason `err`!
+            console.log(`automation-event=failed jobId=${job.id} error=${err}`);
+        })
+            .on("paused", () => {
+            // The queue has been paused.
+            console.log(`automation-event=paused`);
+        })
+            .on("resumed", (job) => {
+            // The queue has been resumed.
+            console.log(`automation-event=paused jobId=${job.id}`);
+        })
+            .on("cleaned", (jobs, type) => {
+            // Old jobs have been cleaned from the queue. `jobs` is an array of cleaned
+            // jobs, and `type` is the type of jobs cleaned.
+            console.log(`automation-event=cleaned length=${jobs.length} type=${type}`);
+        })
+            .on("drained", () => {
+            // Emitted every time the queue has processed all the waiting jobs (even if there can be some delayed jobs not yet processed)
+            console.log(`automation-event=drained`);
+        })
+            .on("removed", (job) => {
+            // A job successfully removed.
+            console.log(`automation-event=removed jobId=${job.id}`);
+        });
+    }
+};

package/dist/automations/logging/index.js

@@ -56,9 +56,6 @@ function checkAppMetadata(apps) {
             for (let [key, errors] of Object.entries(metadata.automationErrors)) {
                 const updated = [];
                 for (let error of errors) {
-                    if (!error) {
-                        continue;
-                    }
                     const startDate = error.split(backend_core_1.db.SEPARATOR)[2];
                     if (startDate > maxStartDate) {
                         updated.push(error);

package/dist/automations/utils.js

@@ -52,10 +52,13 @@ const pro_1 = require("@budibase/pro");
 const WH_STEP_ID = triggerInfo_1.definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const Runner = new threads_1.Thread(threads_1.ThreadType.AUTOMATION);
+const jobMessage = (job, message) => {
+    return `app=${job.data.event.appId} automation=${job.data.automation._id} jobId=${job.id} trigger=${job.data.automation.definition.trigger.event} : ${message}`;
+};
 function processEvent(job) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            console.log(`${job.data.automation.appId} automation ${job.data.automation._id} running`);
+            console.log(jobMessage(job, "running"));
             // need to actually await these so that an error can be captured properly
             const tenantId = backend_core_1.tenancy.getTenantIDFromAppID(job.data.event.appId);
             return yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(this, void 0, void 0, function* () {
@@ -65,7 +68,7 @@ function processEvent(job) {
         }
         catch (err) {
             const errJson = JSON.stringify(err);
-            console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${errJson}`);
+            console.error(jobMessage(job, `was unable to run - ${errJson}`));
             console.trace(err);
             return { err };
         }
@@ -119,6 +122,7 @@ function disableCron(jobId, jobKey) {
     return __awaiter(this, void 0, void 0, function* () {
         yield bullboard_1.queue.removeRepeatableByKey(jobKey);
         yield bullboard_1.queue.removeJobs(jobId);
+        console.log(`jobId=${jobId} disabled`);
     });
 }
 exports.disableCron = disableCron;

package/dist/integrations/base/sql.js

@@ -17,7 +17,6 @@ const types_1 = require("@budibase/types");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
 const environment_1 = __importDefault(require("../../environment"));
-const utils_2 = require("./utils");
 const envLimit = environment_1.default.SQL_MAX_ROWS
     ? parseInt(environment_1.default.SQL_MAX_ROWS)
     : null;
@@ -117,13 +116,12 @@ class InternalBuilder {
     addFilters(query, filters, opts) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                const updatedKey = (0, utils_2.removeKeyNumbering)(key);
-                const isRelationshipField = updatedKey.includes(".");
+                const isRelationshipField = key.includes(".");
                 if (!opts.relationship && !isRelationshipField) {
-                    fn(`${opts.tableName}.${updatedKey}`, value);
+                    fn(`${opts.tableName}.${key}`, value);
                 }
                 if (opts.relationship && isRelationshipField) {
-                    fn(updatedKey, value);
+                    fn(key, value);
                 }
             }
         }
@@ -141,56 +139,6 @@ class InternalBuilder {
                 ]);
             }
         };
-        const contains = (mode, any = false) => {
-            const fnc = allOr ? "orWhere" : "where";
-            const rawFnc = `${fnc}Raw`;
-            const not = mode === (filters === null || filters === void 0 ? void 0 : filters.notContains) ? "NOT " : "";
-            function stringifyArray(value, quoteStyle = '"') {
-                for (let i in value) {
-                    if (typeof value[i] === "string") {
-                        value[i] = `${quoteStyle}${value[i]}${quoteStyle}`;
-                    }
-                }
-                return `[${value.join(",")}]`;
-            }
-            if (this.client === utils_1.SqlClient.POSTGRES) {
-                iterate(mode, (key, value) => {
-                    const wrap = any ? "" : "'";
-                    const containsOp = any ? "\\?| array" : "@>";
-                    const fieldNames = key.split(/\./g);
-                    const tableName = fieldNames[0];
-                    const columnName = fieldNames[1];
-                    // @ts-ignore
-                    query = query[rawFnc](`${not}"${tableName}"."${columnName}"::jsonb ${containsOp} ${wrap}${stringifyArray(value, any ? "'" : '"')}${wrap}`);
-                });
-            }
-            else if (this.client === utils_1.SqlClient.MY_SQL) {
-                const jsonFnc = any ? "JSON_OVERLAPS" : "JSON_CONTAINS";
-                iterate(mode, (key, value) => {
-                    // @ts-ignore
-                    query = query[rawFnc](`${not}${jsonFnc}(${key}, '${stringifyArray(value)}')`);
-                });
-            }
-            else {
-                const andOr = mode === (filters === null || filters === void 0 ? void 0 : filters.containsAny) ? " OR " : " AND ";
-                iterate(mode, (key, value) => {
-                    let statement = "";
-                    for (let i in value) {
-                        if (typeof value[i] === "string") {
-                            value[i] = `%"${value[i]}"%`;
-                        }
-                        else {
-                            value[i] = `%${value[i]}%`;
-                        }
-                        statement +=
-                            (statement ? andOr : "") +
-                                `LOWER(${likeKey(this.client, key)}) LIKE ?`;
-                    }
-                    // @ts-ignore
-                    query = query[rawFnc](`${not}(${statement})`, value);
-                });
-            }
-        };
         if (!filters) {
             return query;
         }
@@ -264,13 +212,32 @@ class InternalBuilder {
             });
         }
         if (filters.contains) {
-            contains(filters.contains);
-        }
-        if (filters.notContains) {
-            contains(filters.notContains);
-        }
-        if (filters.containsAny) {
-            contains(filters.containsAny, true);
+            const fnc = allOr ? "orWhere" : "where";
+            const rawFnc = `${fnc}Raw`;
+            if (this.client === utils_1.SqlClient.POSTGRES) {
+                iterate(filters.contains, (key, value) => {
+                    const fieldNames = key.split(/\./g);
+                    const tableName = fieldNames[0];
+                    const columnName = fieldNames[1];
+                    if (typeof value === "string") {
+                        value = `"${value}"`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`"${tableName}"."${columnName}"::jsonb @> '[${value}]'`);
+                });
+            }
+            else if (this.client === utils_1.SqlClient.MY_SQL) {
+                iterate(filters.contains, (key, value) => {
+                    if (typeof value === "string") {
+                        value = `"${value}"`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`JSON_CONTAINS(${key}, '${value}')`);
+                });
+            }
+            else {
+                iterate(filters.contains, like);
+            }
         }
         return query;
     }
@@ -581,3 +548,4 @@ class SqlQueryBuilder extends sqlTable_1.default {
     }
 }
 exports.default = SqlQueryBuilder;
+module.exports = SqlQueryBuilder;

package/dist/integrations/base/utils.js

@@ -1,16 +1,30 @@
 "use strict";
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeKeyNumbering = void 0;
-const QUERY_START_REGEX = /\d[0-9]*:/g;
-function removeKeyNumbering(key) {
-    if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
-        const parts = key.split(":");
-        // remove the number
-        parts.shift();
-        return parts.join(":");
+var DatasourceUtils;
+(function (DatasourceUtils) {
+    const { integrations } = require("../index");
+    function makeExternalQuery(datasource, json) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const Integration = integrations[datasource.source];
+            // query is the opinionated function
+            if (Integration.prototype.query) {
+                const integration = new Integration(datasource.config);
+                return integration.query(json);
+            }
+            else {
+                throw "Datasource does not support query.";
+            }
+        });
     }
-    else {
-        return key;
-    }
-}
-exports.removeKeyNumbering = removeKeyNumbering;
+    DatasourceUtils.makeExternalQuery = makeExternalQuery;
+    module.exports.makeExternalQuery = makeExternalQuery;
+})(DatasourceUtils || (DatasourceUtils = {}));

package/dist/integrations/microsoftSqlServer.js

@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
-const sql_1 = __importDefault(require("./base/sql"));
 var MSSQLModule;
 (function (MSSQLModule) {
     const sqlServer = require("mssql");
+    const Sql = require("./base/sql");
     const DEFAULT_SCHEMA = "dbo";
     const SCHEMA = {
         docs: "https://github.com/tediousjs/node-mssql",
@@ -72,7 +69,7 @@ var MSSQLModule;
             },
         },
     };
-    class SqlServerIntegration extends sql_1.default {
+    class SqlServerIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClient.MS_SQL);
             this.index = 0;

package/dist/integrations/mongodb.js

@@ -80,11 +80,10 @@ var MongoDBModule;
                     if (json[field] instanceof Object) {
                         json[field] = self.createObjectIds(json[field]);
                     }
-                    if ((field === "_id" || (field === null || field === void 0 ? void 0 : field.startsWith("$"))) &&
-                        typeof json[field] === "string") {
-                        const id = (_a = json[field].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)) === null || _a === void 0 ? void 0 : _a[0];
+                    if (field === "_id" && typeof json[field] === "string") {
+                        const id = (_a = json["_id"].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)) === null || _a === void 0 ? void 0 : _a[0];
                         if (id) {
-                            json[field] = mongodb_1.ObjectID.createFromHexString(id);
+                            json["_id"] = mongodb_1.ObjectID.createFromHexString(id);
                         }
                     }
                 }
@@ -99,33 +98,10 @@ var MongoDBModule;
             return interpolateObjectIds(json);
         }
         parseQueryParams(params, mode) {
-            var _a, _b, _c;
-            let queryParams = [];
-            let openCount = 0;
-            let inQuotes = false;
-            let i = 0;
-            let startIndex = 0;
-            for (let c of params) {
-                if (c === '"' && i > 0 && params[i - 1] !== "\\") {
-                    inQuotes = !inQuotes;
-                }
-                if (c === "{" && !inQuotes) {
-                    openCount++;
-                    if (openCount === 1) {
-                        startIndex = i;
-                    }
-                }
-                else if (c === "}" && !inQuotes) {
-                    if (openCount === 1) {
-                        queryParams.push(JSON.parse(params.substring(startIndex, i + 1)));
-                    }
-                    openCount--;
-                }
-                i++;
-            }
-            let group1 = (_a = queryParams[0]) !== null && _a !== void 0 ? _a : {};
-            let group2 = (_b = queryParams[1]) !== null && _b !== void 0 ? _b : {};
-            let group3 = (_c = queryParams[2]) !== null && _c !== void 0 ? _c : {};
+            let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g);
+            let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {};
+            let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {};
+            let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {};
             if (mode === "update") {
                 return {
                     filter: group1,
@@ -183,10 +159,7 @@ var MongoDBModule;
                             return yield collection.findOne(json);
                         }
                         case "findOneAndUpdate": {
-                            if (typeof query.json === "string") {
-                                json = this.parseQueryParams(query.json, "update");
-                            }
-                            let findAndUpdateJson = this.createObjectIds(json);
+                            let findAndUpdateJson = json;
                             return yield collection.findOneAndUpdate(findAndUpdateJson.filter, findAndUpdateJson.update, findAndUpdateJson.options);
                         }
                         case "count": {

package/dist/integrations/mysql.js

@@ -16,10 +16,10 @@ const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const dayjs_1 = __importDefault(require("dayjs"));
 const { NUMBER_REGEX } = require("../utilities");
-const sql_1 = __importDefault(require("./base/sql"));
 var MySQLModule;
 (function (MySQLModule) {
     const mysql = require("mysql2/promise");
+    const Sql = require("./base/sql");
     const SCHEMA = {
         docs: "https://github.com/sidorares/node-mysql2",
         plus: true,
@@ -96,7 +96,7 @@ var MySQLModule;
         }
         return bindings;
     }
-    class MySQLIntegration extends sql_1.default {
+    class MySQLIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClient.MY_SQL);
             this.tables = {};