@budibase/server 1.0.113 → 1.0.116

package/dist/api/controllers/application.js

@@ -92,7 +92,7 @@ function createInstance(template) {
         const tenantId = isMultiTenant() ? getTenantId() : null;
         const baseAppId = generateAppID(tenantId);
         const appId = generateDevAppID(baseAppId);
-        updateAppId(appId);
+        yield updateAppId(appId);
         const db = getAppDB();
         yield db.put({
             _id: "_design/database",
@@ -347,6 +347,9 @@ exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     catch (err) {
         error = err;
     }
+    finally {
+        yield replication.close();
+    }
     // sync the users
     yield syncGlobalUsers();
     if (error) {

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

@@ -81,11 +81,12 @@ function initDeployedApp(prodAppId) {
 }
 function deployApp(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
+        let replication;
         try {
             const appId = getAppId();
             const devAppId = getDevelopmentAppID(appId);
             const productionAppId = getProdAppID(appId);
-            const replication = new Replication({
+            replication = new Replication({
                 source: devAppId,
                 target: productionAppId,
             });
@@ -109,6 +110,9 @@ function deployApp(deployment) {
             yield storeDeploymentHistory(deployment);
             throw Object.assign(Object.assign({}, err), { message: `Deployment Failed: ${err.message}` });
         }
+        finally {
+            yield replication.close();
+        }
     });
 }
 exports.fetchDeployments = function (ctx) {

package/dist/api/controllers/dev.js

@@ -81,8 +81,9 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const db = getProdAppDB({ skip_setup: true });
         const info = yield db.info();
-        if (info.error)
+        if (info.error) {
             throw info.error;
+        }
         const deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
         if (!deploymentDoc.history ||
             Object.keys(deploymentDoc.history).length === 0) {
@@ -92,11 +93,11 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     catch (err) {
         return ctx.throw(400, "App has not yet been deployed");
     }
+    const replication = new Replication({
+        source: productionAppId,
+        target: appId,
+    });
     try {
-        const replication = new Replication({
-            source: productionAppId,
-            target: appId,
-        });
         yield replication.rollback();
         // update appID in reverted app to be dev version again
         const db = getAppDB();
@@ -112,6 +113,9 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     catch (err) {
         ctx.throw(400, `Unable to revert. ${err}`);
     }
+    finally {
+        yield replication.close();
+    }
 });
 exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = {

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

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 const linkRows = require("../../../db/linkedRows");
 const { generateRowID, getRowParams, getTableIDFromRowID, DocumentTypes, InternalTables, } = require("../../../db/utils");
+const { dangerousGetDB } = require("@budibase/backend-core/db");
 const userController = require("../user");
 const { inputProcessing, outputProcessing, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
@@ -233,7 +234,7 @@ exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return outputProcessing(table, rows);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = dangerousGetDB(ctx.appId);
     const table = yield db.get(ctx.params.tableId);
     let row = yield findRow(ctx, ctx.params.tableId, ctx.params.rowId);
     row = yield outputProcessing(table, row);

package/dist/api/controllers/webhook.js

@@ -55,7 +55,7 @@ exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = yield db.remove(ctx.params.id, ctx.params.rev);
 });
 exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    updateAppId(ctx.params.instance);
+    yield updateAppId(ctx.params.instance);
     const db = getAppDB();
     const webhook = yield db.get(ctx.params.id);
     webhook.bodySchema = toJsonSchema(ctx.request.body);
@@ -80,7 +80,7 @@ exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.trigger = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const prodAppId = getProdAppID(ctx.params.instance);
-    updateAppId(prodAppId);
+    yield updateAppId(prodAppId);
     try {
         const db = getAppDB();
         const webhook = yield db.get(ctx.params.id);

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -13,7 +13,7 @@ const appController = require("../../../controllers/application");
 const { AppStatus } = require("../../../../db/utils");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { TENANT_ID } = require("../../../../tests/utilities/structures");
-const { getAppDB, doInAppContext } = require("@budibase/backend-core/context");
+const { doInAppContext } = require("@budibase/backend-core/context");
 const env = require("../../../../environment");
 function Request(appId, params) {
     this.appId = appId;
@@ -101,9 +101,6 @@ exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failR
         .set(failHeader)
         .expect(403);
 });
-exports.getDB = () => {
-    return getAppDB();
-};
 exports.testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
     return runRequest(automation.appId, () => __awaiter(void 0, void 0, void 0, function* () {
         return yield config.request

package/dist/app.js

@@ -27,10 +27,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 env = __importStar(require("./environment"));
-const CouchDB = require("./db");
-require("@budibase/backend-core").init(CouchDB);
+const db_1 = __importDefault(require("./db"));
+db_1.default.init();
 const Koa = require("koa");
 const destroyable = require("server-destroy");
 const koaBody = require("koa-body");

package/dist/automations/utils.js

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { Thread, ThreadType } = require("../threads");
 const { definitions } = require("./triggerInfo");
 const webhooks = require("../api/controllers/webhook");
-const CouchDB = require("../db");
 const { queue } = require("./bullboard");
 const newid = require("../db/newid");
 const { updateEntityMetadata } = require("../utilities");
 const { MetadataTypes, WebhookType } = require("../constants");
 const { getProdAppID } = require("@budibase/backend-core/db");
 const { cloneDeep } = require("lodash/fp");
+const { doWithDB } = require("@budibase/backend-core/db");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 const WH_STEP_ID = definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = definitions.CRON.stepId;
@@ -94,10 +94,11 @@ exports.enableCronTrigger = (appId, automation) => __awaiter(void 0, void 0, voi
         // can't use getAppDB here as this is likely to be called from dev app,
         // but this call could be for dev app or prod app, need to just use what
         // was passed in
-        const db = new CouchDB(appId);
-        const response = yield db.put(automation);
-        automation._id = response.id;
-        automation._rev = response.rev;
+        yield doWithDB(appId, (db) => __awaiter(void 0, void 0, void 0, function* () {
+            const response = yield db.put(automation);
+            automation._id = response.id;
+            automation._rev = response.rev;
+        }));
     }
     return automation;
 });

package/dist/db/inMemoryView.js

@@ -8,44 +8,46 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const PouchDB = require("pouchdb");
-const memory = require("pouchdb-adapter-memory");
 const newid = require("./newid");
-PouchDB.plugin(memory);
-const Pouch = PouchDB.defaults({
-    prefix: undefined,
-    adapter: "memory",
-});
+// bypass the main application db config
+// use in memory pouchdb directly
+const { getPouch, closeDB } = require("@budibase/backend-core/db");
+const Pouch = getPouch({ inMemory: true });
 exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0, void 0, function* () {
     // use a different ID each time for the DB, make sure they
     // are always unique for each query, don't want overlap
     // which could cause 409s
     const db = new Pouch(newid());
-    // write all the docs to the in memory Pouch (remove revs)
-    yield db.bulkDocs(data.map(row => (Object.assign(Object.assign({}, row), { _rev: undefined }))));
-    let fn = (doc, emit) => emit(doc._id);
-    eval("fn = " + view.map.replace("function (doc)", "function (doc, emit)"));
-    const queryFns = {
-        meta: view.meta,
-        map: fn,
-    };
-    if (view.reduce) {
-        queryFns.reduce = view.reduce;
-    }
-    const response = yield db.query(queryFns, {
-        include_docs: !calculation,
-        group: !!group,
-    });
-    // need to fix the revs to be totally accurate
-    for (let row of response.rows) {
-        if (!row._rev || !row._id) {
-            continue;
+    try {
+        // write all the docs to the in memory Pouch (remove revs)
+        yield db.bulkDocs(data.map(row => (Object.assign(Object.assign({}, row), { _rev: undefined }))));
+        let fn = (doc, emit) => emit(doc._id);
+        eval("fn = " + view.map.replace("function (doc)", "function (doc, emit)"));
+        const queryFns = {
+            meta: view.meta,
+            map: fn,
+        };
+        if (view.reduce) {
+            queryFns.reduce = view.reduce;
         }
-        const found = data.find(possible => possible._id === row._id);
-        if (found) {
-            row._rev = found._rev;
+        const response = yield db.query(queryFns, {
+            include_docs: !calculation,
+            group: !!group,
+        });
+        // need to fix the revs to be totally accurate
+        for (let row of response.rows) {
+            if (!row._rev || !row._id) {
+                continue;
+            }
+            const found = data.find(possible => possible._id === row._id);
+            if (found) {
+                row._rev = found._rev;
+            }
         }
+        return response;
+    }
+    finally {
+        yield db.destroy();
+        yield closeDB(db);
     }
-    yield db.destroy();
-    return response;
 });

package/dist/db/index.js

@@ -1,3 +1,14 @@
 "use strict";
-const client = require("./client");
-module.exports = client;
+const core = require("@budibase/backend-core");
+const env = require("../environment");
+exports.init = () => {
+    const dbConfig = {
+        replication: true,
+        find: true,
+    };
+    if (env.isTest()) {
+        dbConfig.inMemory = true;
+        dbConfig.allDbs = true;
+    }
+    core.init({ db: dbConfig });
+};

package/dist/integrations/couchdb.js

@@ -54,49 +54,43 @@ var CouchDBModule;
             this.config = config;
             this.client = new PouchDB(`${config.url}/${config.database}`);
         }
-        create(query) {
+        query(command, errorMsg, query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    return this.client.post(query.json);
+                    const response = yield this.client[command](query.id || query.json);
+                    yield this.client.close();
+                    return response;
                 }
                 catch (err) {
-                    console.error("Error writing to couchDB", err);
+                    console.error(errorMsg, err);
                     throw err;
                 }
             });
         }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.query("post", "Error writing to couchDB", query);
+            });
+        }
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const result = yield this.client.allDocs(Object.assign({ include_docs: true }, query.json));
-                    return result.rows.map((row) => row.doc);
-                }
-                catch (err) {
-                    console.error("Error querying couchDB", err);
-                    throw err;
-                }
+                const result = yield this.query("allDocs", "Error querying couchDB", {
+                    json: Object.assign({ include_docs: true }, query.json),
+                });
+                return result.rows.map((row) => row.doc);
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return this.client.put(query.json);
-                }
-                catch (err) {
-                    console.error("Error updating couchDB document", err);
-                    throw err;
-                }
+                return this.query("put", "Error updating couchDB document", query);
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return yield this.client.remove(query.id);
-                }
-                catch (err) {
-                    console.error("Error deleting couchDB document", err);
-                    throw err;
-                }
+                const doc = yield this.query("get", "Cannot find doc to be deleted", query);
+                return this.query("remove", "Error deleting couchDB document", {
+                    json: doc,
+                });
             });
         }
     }

package/dist/integrations/queries/sql.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpolateSQL = exports.enrichQueryFields = void 0;
+const string_templates_1 = require("@budibase/string-templates");
+const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g");
+function enrichQueryFields(fields, parameters = {}) {
+    const enrichedQuery = Array.isArray(fields) ? [] : {};
+    // enrich the fields with dynamic parameters
+    for (let key of Object.keys(fields)) {
+        if (fields[key] == null) {
+            continue;
+        }
+        if (typeof fields[key] === "object") {
+            // enrich nested fields object
+            enrichedQuery[key] = enrichQueryFields(fields[key], parameters);
+        }
+        else if (typeof fields[key] === "string") {
+            // enrich string value as normal
+            enrichedQuery[key] = string_templates_1.processStringSync(fields[key], parameters, {
+                noEscaping: true,
+                noHelpers: true,
+                escapeNewlines: true,
+            });
+        }
+        else {
+            enrichedQuery[key] = fields[key];
+        }
+    }
+    if (enrichedQuery.json ||
+        enrichedQuery.customData ||
+        enrichedQuery.requestBody) {
+        try {
+            enrichedQuery.json = JSON.parse(enrichedQuery.json ||
+                enrichedQuery.customData ||
+                enrichedQuery.requestBody);
+        }
+        catch (err) {
+            // no json found, ignore
+        }
+        delete enrichedQuery.customData;
+    }
+    return enrichedQuery;
+}
+exports.enrichQueryFields = enrichQueryFields;
+function interpolateSQL(fields, parameters, integration) {
+    let sql = fields.sql;
+    if (!sql || typeof sql !== "string") {
+        return fields;
+    }
+    const bindings = string_templates_1.findHBSBlocks(sql);
+    let variables = [], arrays = [];
+    for (let binding of bindings) {
+        // look for array/list operations in the SQL statement, which will need handled later
+        const listRegexMatch = sql.match(new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`));
+        // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
+        // start by finding all the instances of const character strings
+        const charConstMatch = sql.match(CONST_CHAR_REGEX) || [];
+        // now look within them to see if a binding is used
+        const charConstBindingMatch = charConstMatch.find((string) => string.match(new RegExp(`'[^']*${binding}[^']*'`)));
+        if (charConstBindingMatch) {
+            let [part1, part2] = charConstBindingMatch.split(binding);
+            part1 = `'${part1.substring(1)}'`;
+            part2 = `'${part2.substring(0, part2.length - 1)}'`;
+            sql = sql.replace(charConstBindingMatch, integration.getStringConcat([
+                part1,
+                integration.getBindingIdentifier(),
+                part2,
+            ]));
+        }
+        // generate SQL parameterised array
+        else if (listRegexMatch) {
+            arrays.push(binding);
+            // determine the length of the array
+            const value = enrichQueryFields([binding], parameters)[0]
+                .split(",")
+                .map((val) => val.trim());
+            // build a string like ($1, $2, $3)
+            let replacement = `${Array.apply(null, Array(value.length))
+                .map(() => integration.getBindingIdentifier())
+                .join(",")}`;
+            // check if parentheses are needed
+            if (!listRegexMatch[0].includes(`(${binding})`)) {
+                replacement = `(${replacement})`;
+            }
+            sql = sql.replace(binding, replacement);
+        }
+        else {
+            sql = sql.replace(binding, integration.getBindingIdentifier());
+        }
+        variables.push(binding);
+    }
+    // replicate the knex structure
+    fields.sql = sql;
+    fields.bindings = 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(",").map((val) => val.trim()));
+        }
+        else {
+            updated.push(fields.bindings[i]);
+        }
+    }
+    fields.bindings = updated;
+    return fields;
+}
+exports.interpolateSQL = interpolateSQL;

package/dist/middleware/builder.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { APP_DEV_PREFIX } = require("../db/utils");
 const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
-const { getDB } = require("@budibase/backend-core/db");
+const { doWithDB } = require("@budibase/backend-core/db");
 const { DocumentTypes } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/backend-core/permissions");
 const { app: appCache } = require("@budibase/backend-core/cache");
@@ -49,14 +49,15 @@ function updateAppUpdatedAt(ctx) {
         if (ctx.method === "GET" || (yield checkDebounce(appId))) {
             return;
         }
-        const db = getDB(appId);
-        const metadata = yield db.get(DocumentTypes.APP_METADATA);
-        metadata.updatedAt = new Date().toISOString();
-        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);
+        yield doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
+            const metadata = yield db.get(DocumentTypes.APP_METADATA);
+            metadata.updatedAt = new Date().toISOString();
+            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);
+        }));
     });
 }
 module.exports = (ctx, permType) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/migrations/index.js

@@ -27,12 +27,8 @@ 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 });
 exports.migrate = exports.MIGRATIONS = void 0;
-const db_1 = __importDefault(require("../db"));
 const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migrations");
 // migration functions
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
@@ -57,6 +53,6 @@ exports.MIGRATIONS = [
     },
 ];
 const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    yield runMigrations(db_1.default, exports.MIGRATIONS, options);
+    yield runMigrations(exports.MIGRATIONS, options);
 });
 exports.migrate = migrate;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.112",
+    "version": "1.0.115",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,9 +68,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.112",
-        "@budibase/client": "^1.0.112",
-        "@budibase/string-templates": "^1.0.112",
+        "@budibase/backend-core": "^1.0.115",
+        "@budibase/client": "^1.0.115",
+        "@budibase/string-templates": "^1.0.115",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -117,7 +117,7 @@
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",
         "posthog-node": "^1.1.4",
-        "pouchdb": "7.2.1",
+        "pouchdb": "7.3.0",
         "pouchdb-adapter-memory": "^7.2.1",
         "pouchdb-all-dbs": "1.0.2",
         "pouchdb-find": "^7.2.2",