@budibase/server 1.0.49-alpha.4 → 1.0.49-alpha.8

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

@@ -22,8 +22,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 const { DataSourceOperation, SortDirection, FieldTypes, NoEmptyFilterStrings, } = require("../../../constants");
 const { breakExternalTableId, breakRowIdField, } = require("../../../integrations/utils");
 const ExternalRequest = require("./ExternalRequest");
-const CouchDB = require("../../../db");
-function handleRequest(appId, operation, tableId, opts = {}) {
+const { getAppDB } = require("@budibase/backend-core/context");
+function handleRequest(operation, tableId, opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
         if (opts && opts.filters) {
@@ -38,27 +38,25 @@ function handleRequest(appId, operation, tableId, opts = {}) {
                 }
             }
         }
-        return new ExternalRequest(appId, operation, tableId, opts.datasource).run(opts);
+        return new ExternalRequest(operation, tableId, opts.datasource).run(opts);
     });
 }
 exports.handleRequest = handleRequest;
 exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const inputs = ctx.request.body;
     const tableId = ctx.params.tableId;
     const id = breakRowIdField(inputs._id);
     // don't save the ID to db
     delete inputs._id;
-    return handleRequest(appId, DataSourceOperation.UPDATE, tableId, {
+    return handleRequest(DataSourceOperation.UPDATE, tableId, {
         id,
         row: inputs,
     });
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const inputs = ctx.request.body;
     const tableId = ctx.params.tableId;
-    return handleRequest(appId, DataSourceOperation.CREATE, tableId, {
+    return handleRequest(DataSourceOperation.CREATE, tableId, {
         row: inputs,
     });
 });
@@ -70,35 +68,31 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return exports.fetch(ctx);
 });
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
-    return handleRequest(appId, DataSourceOperation.READ, tableId);
+    return handleRequest(DataSourceOperation.READ, tableId);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;
-    const response = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
         id,
     });
     return response ? response[0] : response;
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
     const id = ctx.request.body._id;
-    const { row } = yield handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+    const { row } = yield handleRequest(DataSourceOperation.DELETE, tableId, {
         id,
     });
     return { response: { ok: true }, row };
 });
 exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const { rows } = ctx.request.body;
     const tableId = ctx.params.tableId;
     let promises = [];
     for (let row of rows) {
-        promises.push(handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+        promises.push(handleRequest(DataSourceOperation.DELETE, tableId, {
             id: breakRowIdField(row._id),
         }));
     }
@@ -106,7 +100,6 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return { response: { ok: true }, rows: responses.map(resp => resp.row) };
 });
 exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
     const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
     let { bookmark, limit } = params;
@@ -135,14 +128,14 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             [params.sort]: direction,
         };
     }
-    const rows = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const rows = yield handleRequest(DataSourceOperation.READ, tableId, {
         filters: query,
         sort,
         paginate: paginateObj,
     });
     let hasNextPage = false;
     if (paginate && rows.length === limit) {
-        const nextRows = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+        const nextRows = yield handleRequest(DataSourceOperation.READ, tableId, {
             filters: query,
             sort,
             paginate: {
@@ -160,17 +153,16 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     return { valid: true };
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;
     const { datasourceId, tableName } = breakExternalTableId(tableId);
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
     }
     const tables = datasource.entities;
-    const response = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
         id,
         datasource,
     });
@@ -189,7 +181,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
         const linkedTable = tables[breakExternalTableId(linkedTableId).tableName];
         // don't support composite keys right now
         const linkedIds = links.map(link => breakRowIdField(link._id)[0]);
-        row[fieldName] = yield handleRequest(appId, DataSourceOperation.READ, linkedTableId, {
+        row[fieldName] = yield handleRequest(DataSourceOperation.READ, linkedTableId, {
             tables,
             filters: {
                 oneOf: {

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

@@ -19,7 +19,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-const CouchDB = require("../../../db");
 const linkRows = require("../../../db/linkedRows");
 const { generateRowID, getRowParams, DocumentTypes, InternalTables, } = require("../../../db/utils");
 const userController = require("../user");
@@ -32,6 +31,7 @@ const inMemoryViews = require("../../../db/inMemoryView");
 const env = require("../../../environment");
 const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, } = require("../view/utils");
 const { cloneDeep } = require("lodash/fp");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { finaliseRow, updateRelatedFormula } = require("./staticFormula");
 const CALCULATION_TYPES = {
     SUM: "sum",
@@ -83,8 +83,7 @@ function getRawTableData(ctx, db, tableId) {
     });
 }
 exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const inputs = ctx.request.body;
     const tableId = inputs.tableId;
     const isUserTable = tableId === InternalTables.USER_METADATA;
@@ -123,29 +122,27 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     // returned row is cleaned and prepared for writing to DB
     row = yield linkRows.updateLinks({
-        appId,
         eventType: linkRows.EventType.ROW_UPDATE,
         row,
         tableId: row.tableId,
         table,
     });
     // check if any attachments removed
-    yield cleanupAttachments(appId, table, { oldRow, row });
+    yield cleanupAttachments(table, { oldRow, row });
     if (isUserTable) {
         // the row has been updated, need to put it into the ctx
         ctx.request.body = row;
         yield userController.updateMetadata(ctx);
         return { row: ctx.body, table };
     }
-    return finaliseRow(ctx.appId, table, row, {
+    return finaliseRow(table, row, {
         oldTable: dbTable,
         updateFormula: true,
     });
 });
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         let inputs = ctx.request.body;
         inputs.tableId = ctx.params.tableId;
         if (!inputs._rev && !inputs._id) {
@@ -163,27 +160,25 @@ exports.save = function (ctx) {
         }
         // make sure link rows are up to date
         row = yield linkRows.updateLinks({
-            appId,
             eventType: linkRows.EventType.ROW_SAVE,
             row,
             tableId: row.tableId,
             table,
         });
-        return finaliseRow(ctx.appId, table, row, {
+        return finaliseRow(table, row, {
             oldTable: dbTable,
             updateFormula: true,
         });
     });
 };
 exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const viewName = ctx.params.viewName;
     // if this is a table view being looked for just transfer to that
     if (viewName.startsWith(DocumentTypes.TABLE)) {
         ctx.params.tableId = viewName;
         return exports.fetch(ctx);
     }
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const { calculation, group, field } = ctx.query;
     const viewInfo = yield getView(db, viewName);
     let response;
@@ -211,7 +206,7 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
                 schema: {},
             };
         }
-        rows = yield outputProcessing(ctx, table, response.rows);
+        rows = yield outputProcessing(table, response.rows);
     }
     if (calculation === CALCULATION_TYPES.STATS) {
         response.rows = response.rows.map(row => (Object.assign(Object.assign({ group: row.key, field }, row.value), { avg: row.value.sum / row.value.count })));
@@ -228,25 +223,22 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return rows;
 });
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     let table = yield db.get(tableId);
     let rows = yield getRawTableData(ctx, db, tableId);
-    return outputProcessing(ctx, table, rows);
+    return outputProcessing(table, rows);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const table = yield db.get(ctx.params.tableId);
-    let row = yield findRow(ctx, db, ctx.params.tableId, ctx.params.rowId);
-    row = yield outputProcessing(ctx, table, row);
+    let row = yield findRow(ctx, ctx.params.tableId, ctx.params.rowId);
+    row = yield outputProcessing(table, row);
     return row;
 });
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const { _id, _rev } = ctx.request.body;
         let row = yield db.get(_id);
         if (row.tableId !== ctx.params.tableId) {
@@ -254,18 +246,17 @@ exports.destroy = function (ctx) {
         }
         const table = yield db.get(row.tableId);
         // update the row to include full relationships before deleting them
-        row = yield outputProcessing(ctx, table, row, { squash: false });
+        row = yield outputProcessing(table, row, { squash: false });
         // now remove the relationships
         yield linkRows.updateLinks({
-            appId,
             eventType: linkRows.EventType.ROW_DELETE,
             row,
             tableId: row.tableId,
         });
         // remove any attachments that were on the row from object storage
-        yield cleanupAttachments(appId, table, { row });
+        yield cleanupAttachments(table, { row });
         // remove any static formula
-        yield updateRelatedFormula(appId, table, row);
+        yield updateRelatedFormula(table, row);
         let response;
         if (ctx.params.tableId === InternalTables.USER_METADATA) {
             ctx.params = {
@@ -281,17 +272,15 @@ exports.destroy = function (ctx) {
     });
 };
 exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     const table = yield db.get(tableId);
     let { rows } = ctx.request.body;
     // before carrying out any updates, make sure the rows are ready to be returned
     // they need to be the full rows (including previous relationships) for automations
-    rows = yield outputProcessing(ctx, table, rows, { squash: false });
+    rows = yield outputProcessing(table, rows, { squash: false });
     // remove the relationships first
     let updates = rows.map(row => linkRows.updateLinks({
-        appId,
         eventType: linkRows.EventType.ROW_DELETE,
         row,
         tableId: row.tableId,
@@ -308,8 +297,8 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         yield db.bulkDocs(rows.map(row => (Object.assign(Object.assign({}, row), { _deleted: true }))));
     }
     // remove any attachments that were on the rows from object storage
-    yield cleanupAttachments(appId, table, { rows });
-    yield updateRelatedFormula(appId, table, rows);
+    yield cleanupAttachments(table, { rows });
+    yield updateRelatedFormula(table, rows);
     yield Promise.all(updates);
     return { response: { ok: true }, rows };
 });
@@ -318,50 +307,46 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.isCypress()) {
         return { rows: yield exports.fetch(ctx) };
     }
-    const appId = ctx.appId;
     const { tableId } = ctx.params;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
     params.version = ctx.version;
     params.tableId = tableId;
     let response;
     if (paginate) {
-        response = yield paginatedSearch(appId, query, params);
+        response = yield paginatedSearch(query, params);
     }
     else {
-        response = yield fullSearch(appId, query, params);
+        response = yield fullSearch(query, params);
     }
     // Enrich search results with relationships
     if (response.rows && response.rows.length) {
         // enrich with global users if from users table
         if (tableId === InternalTables.USER_METADATA) {
-            response.rows = yield getGlobalUsersFromMetadata(appId, response.rows);
+            response.rows = yield getGlobalUsersFromMetadata(response.rows);
         }
         const table = yield db.get(tableId);
-        response.rows = yield outputProcessing(ctx, table, response.rows);
+        response.rows = yield outputProcessing(table, response.rows);
     }
     return response;
 });
 exports.validate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return validate({
-        appId: ctx.appId,
         tableId: ctx.params.tableId,
         row: ctx.request.body,
     });
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     const rowId = ctx.params.rowId;
     // need table to work out where links go in row
     let [table, row] = yield Promise.all([
         db.get(tableId),
-        findRow(ctx, db, tableId, rowId),
+        findRow(ctx, tableId, rowId),
     ]);
     // get the link docs
     const linkVals = yield linkRows.getLinkDocuments({
-        appId,
         tableId,
         rowId,
     });
@@ -385,7 +370,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
     let linkedRows = [];
     for (let [tableId, rows] of Object.entries(groups)) {
         // need to include the IDs in these rows for any links they may have
-        linkedRows = linkedRows.concat(yield outputProcessing(ctx, tables[tableId], rows));
+        linkedRows = linkedRows.concat(yield outputProcessing(tables[tableId], rows));
     }
     // insert the link rows in the correct place throughout the main row
     for (let fieldName of Object.keys(table.schema)) {

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

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { SearchIndexes } = require("../../../db/utils");
 const fetch = require("node-fetch");
 const { getCouchUrl } = require("@budibase/backend-core/db");
+const { getAppId } = require("@budibase/backend-core/context");
 /**
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
  */
 class QueryBuilder {
-    constructor(appId, base) {
-        this.appId = appId;
+    constructor(base) {
         this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
@@ -221,7 +221,8 @@ class QueryBuilder {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`;
+            const appId = getAppId();
+            const url = `${getCouchUrl()}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`;
             const body = this.buildSearchBody();
             return yield runQuery(url, body);
         });
@@ -254,7 +255,6 @@ const runQuery = (url, body) => __awaiter(void 0, void 0, void 0, function* () {
  * Gets round the fixed limit of 200 results from a query by fetching as many
  * pages as required and concatenating the results. This recursively operates
  * until enough results have been found.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -267,7 +267,7 @@ const runQuery = (url, body) => __awaiter(void 0, void 0, void 0, function* () {
  *   rows {array|null} Current results in the recursive search
  * @returns {Promise<*[]|*>}
  */
-const recursiveSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
+const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
     const bookmark = params.bookmark;
     const rows = params.rows || [];
     if (rows.length >= params.limit) {
@@ -277,7 +277,7 @@ const recursiveSearch = (appId, query, params) => __awaiter(void 0, void 0, void
     if (rows.length > params.limit - 200) {
         pageSize = params.limit - rows.length;
     }
-    const page = yield new QueryBuilder(appId, query)
+    const page = yield new QueryBuilder(query)
         .setVersion(params.version)
         .setTable(params.tableId)
         .setBookmark(bookmark)
@@ -293,13 +293,12 @@ const recursiveSearch = (appId, query, params) => __awaiter(void 0, void 0, void
         return [...rows, ...page.rows];
     }
     const newParams = Object.assign(Object.assign({}, params), { bookmark: page.bookmark, rows: [...rows, ...page.rows] });
-    return yield recursiveSearch(appId, query, newParams);
+    return yield recursiveSearch(query, newParams);
 });
 /**
  * Performs a paginated search. A bookmark will be returned to allow the next
  * page to be fetched. There is a max limit off 200 results per page in a
  * paginated search.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -311,13 +310,13 @@ const recursiveSearch = (appId, query, params) => __awaiter(void 0, void 0, void
  *   bookmark {string} The bookmark to resume from
  * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
  */
-exports.paginatedSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
+exports.paginatedSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
     let limit = params.limit;
     if (limit == null || isNaN(limit) || limit < 0) {
         limit = 50;
     }
     limit = Math.min(limit, 200);
-    const search = new QueryBuilder(appId, query)
+    const search = new QueryBuilder(query)
         .setVersion(params.version)
         .setTable(params.tableId)
         .setSort(params.sort)
@@ -340,7 +339,6 @@ exports.paginatedSearch = (appId, query, params) => __awaiter(void 0, void 0, vo
  * desired amount of results. There is a limit of 1000 results to avoid
  * heavy performance hits, and to avoid client components breaking from
  * handling too much data.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -351,12 +349,12 @@ exports.paginatedSearch = (appId, query, params) => __awaiter(void 0, void 0, vo
  *   limit {number} The desired number of results
  * @returns {Promise<{rows: *}>}
  */
-exports.fullSearch = (appId, query, params) => __awaiter(void 0, void 0, void 0, function* () {
+exports.fullSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
     let limit = params.limit;
     if (limit == null || isNaN(limit) || limit < 0) {
         limit = 1000;
     }
     params.limit = Math.min(limit, 1000);
-    const rows = yield recursiveSearch(appId, query, params);
+    const rows = yield recursiveSearch(query, params);
     return { rows };
 });

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

@@ -8,20 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../../db");
 const { getRowParams } = require("../../../db/utils");
 const { outputProcessing, processAutoColumn, processFormulas, } = require("../../../utilities/rowProcessor");
 const { FieldTypes, FormulaTypes } = require("../../../constants");
 const { isEqual } = require("lodash");
 const { cloneDeep } = require("lodash/fp");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * This function runs through a list of enriched rows, looks at the rows which
  * are related and then checks if they need the state of their formulas
  * updated.
  * NOTE: this will only for affect static formulas.
  */
-exports.updateRelatedFormula = (appId, table, enrichedRows) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.updateRelatedFormula = (table, enrichedRows) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     // no formula to update, we're done
     if (!table.relatedFormula) {
         return;
@@ -59,7 +59,7 @@ exports.updateRelatedFormula = (appId, table, enrichedRows) => __awaiter(void 0,
                 if (column.type === FieldTypes.FORMULA &&
                     column.formulaType === FormulaTypes.STATIC) {
                     // re-enrich rows for all the related, don't update the related formula for them
-                    promises = promises.concat(relatedRows[tableId].map(related => exports.finaliseRow(appId, relatedTable, related, {
+                    promises = promises.concat(relatedRows[tableId].map(related => exports.finaliseRow(relatedTable, related, {
                         updateFormula: false,
                     })));
                 }
@@ -68,15 +68,15 @@ exports.updateRelatedFormula = (appId, table, enrichedRows) => __awaiter(void 0,
     }
     yield Promise.all(promises);
 });
-exports.updateAllFormulasInTable = (appId, table) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.updateAllFormulasInTable = (table) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     // start by getting the raw rows (which will be written back to DB after update)
     let rows = (yield db.allDocs(getRowParams(table._id, null, {
         include_docs: true,
     }))).rows.map(row => row.doc);
     // now enrich the rows, note the clone so that we have the base state of the
     // rows so that we don't write any of the enriched information back
-    let enrichedRows = yield outputProcessing({ appId }, table, cloneDeep(rows), {
+    let enrichedRows = yield outputProcessing(table, cloneDeep(rows), {
         squash: false,
     });
     const updatedRows = [];
@@ -102,11 +102,11 @@ exports.updateAllFormulasInTable = (appId, table) => __awaiter(void 0, void 0, v
  * row. The reason we need to return the enriched row is that the automation row created trigger
  * expects the row to be totally enriched/contain all relationships.
  */
-exports.finaliseRow = (appId, table, row, { oldTable, updateFormula } = { updateFormula: true }) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.finaliseRow = (table, row, { oldTable, updateFormula } = { updateFormula: true }) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     row.type = "row";
     // process the row before return, to include relationships
-    let enrichedRow = yield outputProcessing({ appId }, table, cloneDeep(row), {
+    let enrichedRow = yield outputProcessing(table, cloneDeep(row), {
         squash: false,
     });
     // use enriched row to generate formulas for saving, specifically only use as context
@@ -141,7 +141,7 @@ exports.finaliseRow = (appId, table, row, { oldTable, updateFormula } = { update
     enrichedRow = yield processFormulas(table, enrichedRow, { dynamic: false });
     // this updates the related formulas in other rows based on the relations to this row
     if (updateFormula) {
-        yield exports.updateRelatedFormula(appId, table, enrichedRow);
+        yield exports.updateRelatedFormula(table, enrichedRow);
     }
     return { row: enrichedRow, table };
 });

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

@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const validateJs = require("validate.js");
 const { cloneDeep } = require("lodash/fp");
-const CouchDB = require("../../../db");
 const { InternalTables } = require("../../../db/utils");
 const userController = require("../user");
 const { FieldTypes } = require("../../../constants");
 const { processStringSync } = require("@budibase/string-templates");
 const { makeExternalQuery } = require("../../../integrations/base/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -25,13 +25,14 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
-exports.getDatasourceAndQuery = (appId, json) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
     const datasourceId = json.endpoint.datasourceId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const datasource = yield db.get(datasourceId);
     return makeExternalQuery(datasource, json);
 });
-exports.findRow = (ctx, db, tableId, rowId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.findRow = (ctx, tableId, rowId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     let row;
     // TODO remove special user case in future
     if (tableId === InternalTables.USER_METADATA) {
@@ -49,9 +50,9 @@ exports.findRow = (ctx, db, tableId, rowId) => __awaiter(void 0, void 0, void 0,
     }
     return row;
 });
-exports.validate = ({ appId, tableId, row, table }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!table) {
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         table = yield db.get(tableId);
     }
     const errors = {};

package/dist/api/controllers/screen.js

@@ -8,20 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { getScreenParams, generateScreenID } = require("../../db/utils");
 const { AccessController } = require("@budibase/backend-core/roles");
+const { getAppDB } = require("@budibase/backend-core/context");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     const screens = (yield db.allDocs(getScreenParams(null, {
         include_docs: true,
     }))).rows.map(element => element.doc);
-    ctx.body = yield new AccessController(appId).checkScreensAccess(screens, ctx.user.role._id);
+    ctx.body = yield new AccessController().checkScreensAccess(screens, ctx.user.role._id);
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     let screen = ctx.request.body;
     if (!screen._id) {
         screen._id = generateScreenID();
@@ -31,7 +29,7 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev });
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(ctx.appId);
+    const db = getAppDB();
     yield db.remove(ctx.params.screenId, ctx.params.screenRev);
     ctx.body = {
         message: "Screen deleted successfully",