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

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

@@ -15,13 +15,13 @@ const uuid = require("uuid");
 const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
 const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../../db");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes } = require("../../../db/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 const AWS = require("aws-sdk");
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -48,7 +48,7 @@ function getAppIdFromUrl(ctx) {
         // the "appId" component of the URL can be the id or the custom url
         let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}`;
         // search prod apps for a url that matches, exclude dev where id is always used
-        const apps = yield getAllApps(CouchDB, { dev: false });
+        const apps = yield getAllApps({ dev: false });
         const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
         if (app && app.appId) {
             return app.appId;
@@ -86,7 +86,7 @@ exports.serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let appId = yield getAppIdFromUrl(ctx);
         const App = require("./templates/BudibaseApp.svelte").default;
-        const db = new CouchDB(appId, { skip_setup: true });
+        const db = getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentTypes.APP_METADATA);
         const { head, html, css } = App.render({
             title: appInfo.name,
@@ -113,7 +113,7 @@ exports.serveClientLibrary = function (ctx) {
 exports.getSignedUploadURL = function (ctx) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        const database = new CouchDB(ctx.appId);
+        const database = getAppDB();
         // Ensure datasource is valid
         let datasource;
         try {

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

@@ -8,13 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../../db");
 const { FieldTypes, FormulaTypes } = require("../../../constants");
 const { getAllInternalTables, clearColumns } = require("./utils");
 const { doesContainStrings } = require("@budibase/string-templates");
 const { cloneDeep } = require("lodash/fp");
 const { isEqual, uniq } = require("lodash");
 const { updateAllFormulasInTable } = require("../row/staticFormula");
+const { getAppDB } = require("@budibase/backend-core/context");
 function isStaticFormula(column) {
     return (column.type === FieldTypes.FORMULA &&
         column.formulaType === FormulaTypes.STATIC);
@@ -42,11 +42,10 @@ function getFormulaThatUseColumn(table, columnNames) {
  * This functions checks for when a related table, column or related column is deleted, if any
  * tables need to have the formula column removed.
  */
-function checkIfFormulaNeedsCleared(appId, table, { oldTable, deletion }) {
+function checkIfFormulaNeedsCleared(table, { oldTable, deletion }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(appId);
         // start by retrieving all tables, remove the current table from the list
-        const tables = (yield getAllInternalTables(appId)).filter(tbl => tbl._id !== table._id);
+        const tables = (yield getAllInternalTables()).filter(tbl => tbl._id !== table._id);
         const schemaToUse = oldTable ? oldTable.schema : table.schema;
         let removedColumns = Object.values(schemaToUse).filter(column => deletion || !table.schema[column.name]);
         // remove any formula columns that used related columns
@@ -58,7 +57,7 @@ function checkIfFormulaNeedsCleared(appId, table, { oldTable, deletion }) {
             }
             const columnsToDelete = getFormulaThatUseColumn(tableToUse, removed.name);
             if (columnsToDelete.length > 0) {
-                yield clearColumns(db, table, columnsToDelete);
+                yield clearColumns(table, columnsToDelete);
             }
             // need a special case, where a column has been removed from this table, but was used
             // in a different, related tables formula
@@ -79,7 +78,7 @@ function checkIfFormulaNeedsCleared(appId, table, { oldTable, deletion }) {
                         ]));
                     }
                     if (relatedFormulaToRemove.length > 0) {
-                        yield clearColumns(db, relatedTable, uniq(relatedFormulaToRemove));
+                        yield clearColumns(relatedTable, uniq(relatedFormulaToRemove));
                     }
                 }
             }
@@ -92,11 +91,11 @@ function checkIfFormulaNeedsCleared(appId, table, { oldTable, deletion }) {
  * can manage hydrating related rows formula fields. This is
  * specifically only for static formula.
  */
-function updateRelatedFormulaLinksOnTables(appId, table, { deletion } = { deletion: false }) {
+function updateRelatedFormulaLinksOnTables(table, { deletion } = { deletion: false }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         // start by retrieving all tables, remove the current table from the list
-        const tables = (yield getAllInternalTables(appId)).filter(tbl => tbl._id !== table._id);
+        const tables = (yield getAllInternalTables()).filter(tbl => tbl._id !== table._id);
         // clone the tables, so we can compare at end
         const initialTables = cloneDeep(tables);
         // first find the related column names
@@ -138,7 +137,7 @@ function updateRelatedFormulaLinksOnTables(appId, table, { deletion } = { deleti
         }
     });
 }
-function checkIfFormulaUpdated(appId, table, { oldTable }) {
+function checkIfFormulaUpdated(table, { oldTable }) {
     return __awaiter(this, void 0, void 0, function* () {
         // look to see if any formula values have changed
         const shouldUpdate = Object.values(table.schema).find(column => isStaticFormula(column) &&
@@ -147,14 +146,14 @@ function checkIfFormulaUpdated(appId, table, { oldTable }) {
                 !isEqual(oldTable.schema[column.name], column)));
         // if a static formula column has updated, then need to run the update
         if (shouldUpdate != null) {
-            yield updateAllFormulasInTable(appId, table);
+            yield updateAllFormulasInTable(table);
         }
     });
 }
-exports.runStaticFormulaChecks = (appId, table, { oldTable, deletion }) => __awaiter(void 0, void 0, void 0, function* () {
-    yield updateRelatedFormulaLinksOnTables(appId, table, { deletion });
-    yield checkIfFormulaNeedsCleared(appId, table, { oldTable, deletion });
+exports.runStaticFormulaChecks = (table, { oldTable, deletion }) => __awaiter(void 0, void 0, void 0, function* () {
+    yield updateRelatedFormulaLinksOnTables(table, { deletion });
+    yield checkIfFormulaNeedsCleared(table, { oldTable, deletion });
     if (!deletion) {
-        yield checkIfFormulaUpdated(appId, table, { oldTable });
+        yield checkIfFormulaUpdated(table, { oldTable });
     }
 });

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

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../../db");
 const { buildExternalTableId, breakExternalTableId, } = require("../../../integrations/utils");
 const { getTable, generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
 const { DataSourceOperation, FieldTypes, RelationshipTypes, } = require("../../../constants");
@@ -16,6 +15,7 @@ const { makeExternalQuery } = require("../../../integrations/base/utils");
 const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");
+const { getAppDB } = require("@budibase/backend-core/context");
 function makeTableRequest(datasource, operation, table, tables, oldTable = null) {
     return __awaiter(this, void 0, void 0, function* () {
         const json = {
@@ -134,7 +134,6 @@ function isRelationshipSetup(column) {
 }
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
         const table = ctx.request.body;
         // can't do this right now
         delete table.dataImport;
@@ -146,12 +145,12 @@ exports.save = function (ctx) {
         let tableToSave = Object.assign({ type: "table", _id: buildExternalTableId(datasourceId, table.name) }, table);
         let oldTable;
         if (ctx.request.body && ctx.request.body._id) {
-            oldTable = yield getTable(appId, ctx.request.body._id);
+            oldTable = yield getTable(ctx.request.body._id);
         }
         if (hasTypeChanged(tableToSave, oldTable)) {
             ctx.throw(400, "A column type has changed.");
         }
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const datasource = yield db.get(datasourceId);
         const oldTables = cloneDeep(datasource.entities);
         const tables = datasource.entities;
@@ -215,13 +214,12 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const tableToDelete = yield getTable(appId, ctx.params.tableId);
+        const tableToDelete = yield getTable(ctx.params.tableId);
         if (!tableToDelete || !tableToDelete.created) {
             ctx.throw(400, "Cannot delete tables which weren't created in Budibase.");
         }
         const datasourceId = getDatasourceId(tableToDelete);
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const datasource = yield db.get(datasourceId);
         const tables = datasource.entities;
         const operation = DataSourceOperation.DELETE_TABLE;
@@ -234,14 +232,13 @@ exports.destroy = function (ctx) {
 };
 exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const table = yield getTable(appId, ctx.params.tableId);
+        const table = yield getTable(ctx.params.tableId);
         const { dataImport } = ctx.request.body;
         if (!dataImport || !dataImport.schema || !dataImport.csvString) {
             ctx.throw(400, "Provided data import information is invalid.");
         }
         const rows = yield csvParser.transform(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
-        yield handleRequest(appId, DataSourceOperation.BULK_CREATE, table._id, {
+        yield handleRequest(DataSourceOperation.BULK_CREATE, table._id, {
             rows,
         });
         return table;

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

@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../../db");
 const internal = require("./internal");
 const external = require("./external");
 const csvParser = require("../../../utilities/csvParser");
 const { isExternalTable, isSQL } = require("../../../integrations/utils");
 const { getDatasourceParams } = require("../../../db/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { getTable, getAllInternalTables } = require("./utils");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
@@ -30,8 +30,8 @@ function pickApi({ tableId, table }) {
 // covers both internal and external
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
-        const internal = yield getAllInternalTables(ctx.appId);
+        const db = getAppDB();
+        const internal = yield getAllInternalTables();
         const externalTables = yield db.allDocs(getDatasourceParams("plus", {
             include_docs: true,
         }));
@@ -50,7 +50,7 @@ exports.fetch = function (ctx) {
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.id;
-        ctx.body = yield getTable(ctx.appId, tableId);
+        ctx.body = yield getTable(tableId);
     });
 };
 exports.save = function (ctx) {
@@ -93,7 +93,7 @@ exports.validateCSVSchema = function (ctx) {
         const { csvString, schema = {}, tableId } = ctx.request.body;
         let existingTable;
         if (tableId) {
-            existingTable = yield getTable(ctx.appId, tableId);
+            existingTable = yield getTable(tableId);
         }
         let result = yield csvParser.parse(csvString, schema);
         if (existingTable) {

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

@@ -19,18 +19,18 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-const CouchDB = require("../../../db");
 const linkRows = require("../../../db/linkedRows");
 const { getRowParams, generateTableID } = require("../../../db/utils");
 const { FieldTypes } = require("../../../constants");
 const { TableSaveFunctions, hasTypeChanged, getTable, handleDataImport, } = require("./utils");
 const usageQuota = require("../../../utilities/usageQuota");
+const { getAppDB } = require("@budibase/backend-core/context");
+const env = require("../../../environment");
 const { cleanupAttachments } = require("../../../utilities/rowProcessor");
 const { runStaticFormulaChecks } = require("./bulkFormula");
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const _a = ctx.request.body, { dataImport } = _a, rest = __rest(_a, ["dataImport"]);
         let tableToSave = Object.assign({ type: "table", _id: generateTableID(), views: {} }, rest);
         // if the table obj had an _id then it will have been retrieved
@@ -44,8 +44,7 @@ exports.save = function (ctx) {
         // saving a table is a complex operation, involving many different steps, this
         // has been broken out into a utility to make it more obvious/easier to manipulate
         const tableSaveFunctions = new TableSaveFunctions({
-            db,
-            ctx,
+            user: ctx.user,
             oldTable,
             dataImport,
         });
@@ -85,7 +84,6 @@ exports.save = function (ctx) {
         // update linked rows
         try {
             const linkResp = yield linkRows.updateLinks({
-                appId,
                 eventType: oldTable
                     ? linkRows.EventType.TABLE_UPDATED
                     : linkRows.EventType.TABLE_SAVE,
@@ -109,14 +107,13 @@ exports.save = function (ctx) {
         tableToSave._rev = result.rev;
         tableToSave = yield tableSaveFunctions.after(tableToSave);
         // has to run after, make sure it has _id
-        yield runStaticFormulaChecks(appId, tableToSave, { oldTable });
+        yield runStaticFormulaChecks(tableToSave, { oldTable });
         return tableToSave;
     });
 };
 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 tableToDelete = yield db.get(ctx.params.tableId);
         // Delete all rows for that table
         const rows = yield db.allDocs(getRowParams(ctx.params.tableId, null, {
@@ -126,30 +123,30 @@ exports.destroy = function (ctx) {
         yield usageQuota.update(usageQuota.Properties.ROW, -rows.rows.length);
         // update linked rows
         yield linkRows.updateLinks({
-            appId,
             eventType: linkRows.EventType.TABLE_DELETE,
             table: tableToDelete,
         });
         // don't remove the table itself until very end
         yield db.remove(tableToDelete);
         // remove table search index
-        const currentIndexes = yield db.getIndexes();
-        const existingIndex = currentIndexes.indexes.find(existing => existing.name === `search:${ctx.params.tableId}`);
-        if (existingIndex) {
-            yield db.deleteIndex(existingIndex);
+        if (!env.isTest()) {
+            const currentIndexes = yield db.getIndexes();
+            const existingIndex = currentIndexes.indexes.find(existing => existing.name === `search:${ctx.params.tableId}`);
+            if (existingIndex) {
+                yield db.deleteIndex(existingIndex);
+            }
         }
         // has to run after, make sure it has _id
-        yield runStaticFormulaChecks(appId, tableToDelete, { deletion: true });
-        yield cleanupAttachments(appId, tableToDelete, { rows });
+        yield runStaticFormulaChecks(tableToDelete, { deletion: true });
+        yield cleanupAttachments(tableToDelete, { rows });
         return tableToDelete;
     });
 };
 exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const table = yield getTable(appId, ctx.params.tableId);
+        const table = yield getTable(ctx.params.tableId);
         const { dataImport } = ctx.request.body;
-        yield handleDataImport(appId, ctx.user, table, dataImport);
+        yield handleDataImport(ctx.user, table, dataImport);
         return table;
     });
 };

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

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../../db");
 const csvParser = require("../../../utilities/csvParser");
 const { getRowParams, generateRowID, InternalTables, getTableParams, BudibaseInternalDB, } = require("../../../db/utils");
 const { isEqual } = require("lodash");
@@ -19,9 +18,10 @@ const { isExternalTable, breakExternalTableId, isSQL, } = require("../../../inte
 const { getViews, saveView } = require("../view/utils");
 const viewTemplate = require("../view/viewBuilder");
 const usageQuota = require("../../../utilities/usageQuota");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { cloneDeep } = require("lodash/fp");
-exports.clearColumns = (appId, table, columnNames) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.clearColumns = (table, columnNames) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const rows = yield db.allDocs(getRowParams(table._id, null, {
         include_docs: true,
     }));
@@ -30,7 +30,8 @@ exports.clearColumns = (appId, table, columnNames) => __awaiter(void 0, void 0,
         return doc;
     }));
 });
-exports.checkForColumnUpdates = (appId, db, oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
+exports.checkForColumnUpdates = (oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     let updatedRows = [];
     const rename = updatedTable._rename;
     let deletedColumns = [];
@@ -56,9 +57,9 @@ exports.checkForColumnUpdates = (appId, db, oldTable, updatedTable) => __awaiter
             return row;
         });
         // cleanup any attachments from object storage for deleted attachment columns
-        yield cleanupAttachments(appId, updatedTable, { oldTable, rows: rawRows });
+        yield cleanupAttachments(updatedTable, { oldTable, rows: rawRows });
         // Update views
-        yield exports.checkForViewUpdates(db, updatedTable, rename, deletedColumns);
+        yield exports.checkForViewUpdates(updatedTable, rename, deletedColumns);
         delete updatedTable._rename;
     }
     return { rows: updatedRows, table: updatedTable };
@@ -81,11 +82,11 @@ exports.makeSureTableUpToDate = (table, tableToSave) => {
     }
     return tableToSave;
 };
-exports.handleDataImport = (appId, user, table, dataImport) => __awaiter(void 0, void 0, void 0, function* () {
+exports.handleDataImport = (user, table, dataImport) => __awaiter(void 0, void 0, void 0, function* () {
     if (!dataImport || !dataImport.csvString) {
         return table;
     }
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     // Populate the table with rows imported from CSV in a bulk update
     const data = yield csvParser.transform(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
     let finalData = [];
@@ -120,8 +121,8 @@ exports.handleDataImport = (appId, user, table, dataImport) => __awaiter(void 0,
     table._rev = response._rev;
     return table;
 });
-exports.handleSearchIndexes = (appId, table) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.handleSearchIndexes = (table) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     // create relevant search indexes
     if (table.indexes && table.indexes.length > 0) {
         const currentIndexes = yield db.getIndexes();
@@ -170,12 +171,9 @@ exports.checkStaticTables = table => {
     return table;
 };
 class TableSaveFunctions {
-    constructor({ db, ctx, oldTable, dataImport }) {
-        this.db = db;
-        this.ctx = ctx;
-        if (this.ctx && this.ctx.user) {
-            this.appId = this.ctx.appId;
-        }
+    constructor({ user, oldTable, dataImport }) {
+        this.db = getAppDB();
+        this.user = user;
         this.oldTable = oldTable;
         this.dataImport = dataImport;
         // any rows that need updated
@@ -194,7 +192,7 @@ class TableSaveFunctions {
     // when confirmed valid
     mid(table) {
         return __awaiter(this, void 0, void 0, function* () {
-            let response = yield exports.checkForColumnUpdates(this.appId, this.db, this.oldTable, table);
+            let response = yield exports.checkForColumnUpdates(this.oldTable, table);
             this.rows = this.rows.concat(response.rows);
             return table;
         });
@@ -202,8 +200,8 @@ class TableSaveFunctions {
     // after saving
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
-            table = yield exports.handleSearchIndexes(this.appId, table);
-            table = yield exports.handleDataImport(this.appId, this.ctx.user, table, this.dataImport);
+            table = yield exports.handleSearchIndexes(table);
+            table = yield exports.handleDataImport(this.user, table, this.dataImport);
             return table;
         });
     }
@@ -211,39 +209,39 @@ class TableSaveFunctions {
         return this.rows;
     }
 }
-exports.getAllInternalTables = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.getAllInternalTables = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const internalTables = yield db.allDocs(getTableParams(null, {
         include_docs: true,
     }));
     return internalTables.rows.map(tableDoc => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
 });
-exports.getAllExternalTables = (appId, datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.getAllExternalTables = (datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         throw "Datasource is not configured fully.";
     }
     return datasource.entities;
 });
-exports.getExternalTable = (appId, datasourceId, tableName) => __awaiter(void 0, void 0, void 0, function* () {
-    const entities = yield exports.getAllExternalTables(appId, datasourceId);
+exports.getExternalTable = (datasourceId, tableName) => __awaiter(void 0, void 0, void 0, function* () {
+    const entities = yield exports.getAllExternalTables(datasourceId);
     return entities[tableName];
 });
-exports.getTable = (appId, tableId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.getTable = (tableId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     if (isExternalTable(tableId)) {
         let { datasourceId, tableName } = breakExternalTableId(tableId);
         const datasource = yield db.get(datasourceId);
-        const table = yield exports.getExternalTable(appId, datasourceId, tableName);
+        const table = yield exports.getExternalTable(datasourceId, tableName);
         return Object.assign(Object.assign({}, table), { sql: isSQL(datasource) });
     }
     else {
         return db.get(tableId);
     }
 });
-exports.checkForViewUpdates = (db, table, rename, deletedColumns) => __awaiter(void 0, void 0, void 0, function* () {
-    const views = yield getViews(db);
+exports.checkForViewUpdates = (table, rename, deletedColumns) => __awaiter(void 0, void 0, void 0, function* () {
+    const views = yield getViews();
     const tableViews = views.filter(view => view.meta.tableId === table._id);
     // Check each table view to see if impacted by this table action
     for (let view of tableViews) {
@@ -299,7 +297,7 @@ exports.checkForViewUpdates = (db, table, rename, deletedColumns) => __awaiter(v
         // Update view if required
         if (needsUpdated) {
             const newViewTemplate = viewTemplate(view.meta);
-            yield saveView(db, null, view.name, newViewTemplate);
+            yield saveView(null, view.name, newViewTemplate);
             if (!newViewTemplate.meta.schema) {
                 newViewTemplate.meta.schema = table.schema;
             }

package/dist/api/controllers/user.js

@@ -8,18 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { generateUserMetadataID, getUserMetadataParams, generateUserFlagID, } = require("../../db/utils");
 const { InternalTables } = require("../../db/utils");
 const { getGlobalUsers, getRawGlobalUser } = require("../../utilities/global");
 const { getFullUser } = require("../../utilities/users");
 const { isEqual } = require("lodash");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { getDevelopmentAppID, getDeployedAppIDs, } = require("@budibase/backend-core/db");
-const { doesDatabaseExist } = require("../../utilities");
+const { getDevelopmentAppID, getProdAppIDs, dbExists, } = require("@budibase/backend-core/db");
 const { UserStatus } = require("@budibase/backend-core/constants");
-function rawMetadata(db) {
+const { getAppDB } = require("@budibase/backend-core/context");
+function rawMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
+        const db = getAppDB();
         return (yield db.allDocs(getUserMetadataParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
@@ -45,13 +45,10 @@ function combineMetadataAndUser(user, metadata) {
     }
     return null;
 }
-exports.syncGlobalUsers = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.syncGlobalUsers = () => __awaiter(void 0, void 0, void 0, function* () {
     // sync user metadata
-    const db = new CouchDB(appId);
-    const [users, metadata] = yield Promise.all([
-        getGlobalUsers(appId),
-        rawMetadata(db),
-    ]);
+    const db = getAppDB();
+    const [users, metadata] = yield Promise.all([getGlobalUsers(), rawMetadata()]);
     const toWrite = [];
     for (let user of users) {
         const combined = yield combineMetadataAndUser(user, metadata);
@@ -86,7 +83,7 @@ exports.syncUser = function (ctx) {
         let prodAppIds;
         // if they are a builder then get all production app IDs
         if ((user.builder && user.builder.global) || deleting) {
-            prodAppIds = yield getDeployedAppIDs(CouchDB);
+            prodAppIds = yield getProdAppIDs();
         }
         else {
             prodAppIds = Object.entries(roles)
@@ -97,10 +94,10 @@ exports.syncUser = function (ctx) {
             const roleId = roles[prodAppId];
             const devAppId = getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
-                if (!(yield doesDatabaseExist(appId))) {
+                if (!(yield dbExists(appId))) {
                     continue;
                 }
-                const db = new CouchDB(appId);
+                const db = getAppDB();
                 const metadataId = generateUserMetadataID(userId);
                 let metadata;
                 try {
@@ -134,8 +131,8 @@ exports.syncUser = function (ctx) {
 };
 exports.fetchMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = new CouchDB(ctx.appId);
-        const global = yield getGlobalUsers(ctx.appId);
+        const database = getAppDB();
+        const global = yield getGlobalUsers();
         const metadata = yield rawMetadata(database);
         const users = [];
         for (let user of global) {
@@ -162,8 +159,7 @@ exports.updateSelfMetadata = function (ctx) {
 };
 exports.updateMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const user = ctx.request.body;
         // this isn't applicable to the user
         delete user.roles;
@@ -173,7 +169,7 @@ exports.updateMetadata = function (ctx) {
 };
 exports.destroyMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         try {
             const dbUser = yield db.get(ctx.params.id);
             yield db.remove(dbUser._id, dbUser._rev);
@@ -199,7 +195,7 @@ exports.setFlag = function (ctx) {
             ctx.throw(400, "Must supply a 'flag' field in request body.");
         }
         const flagDocId = generateUserFlagID(userId);
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         let doc;
         try {
             doc = yield db.get(flagDocId);
@@ -216,7 +212,7 @@ exports.getFlags = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const userId = ctx.user._id;
         const docId = generateUserFlagID(userId);
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         let doc;
         try {
             doc = yield db.get(docId);