@budibase/server 1.0.49-alpha.9 → 1.0.49

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

@@ -8,6 +8,7 @@ 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");
@@ -15,7 +16,6 @@ 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,6 +134,7 @@ 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;
@@ -145,12 +146,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(ctx.request.body._id);
+            oldTable = yield getTable(appId, ctx.request.body._id);
         }
         if (hasTypeChanged(tableToSave, oldTable)) {
             ctx.throw(400, "A column type has changed.");
         }
-        const db = getAppDB();
+        const db = new CouchDB(appId);
         const datasource = yield db.get(datasourceId);
         const oldTables = cloneDeep(datasource.entities);
         const tables = datasource.entities;
@@ -214,12 +215,13 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tableToDelete = yield getTable(ctx.params.tableId);
+        const appId = ctx.appId;
+        const tableToDelete = yield getTable(appId, 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 = getAppDB();
+        const db = new CouchDB(appId);
         const datasource = yield db.get(datasourceId);
         const tables = datasource.entities;
         const operation = DataSourceOperation.DELETE_TABLE;
@@ -232,13 +234,14 @@ exports.destroy = function (ctx) {
 };
 exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield getTable(ctx.params.tableId);
+        const appId = ctx.appId;
+        const table = yield getTable(appId, 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(DataSourceOperation.BULK_CREATE, table._id, {
+        yield handleRequest(appId, DataSourceOperation.BULK_CREATE, table._id, {
             rows,
         });
         return table;

package/dist/api/controllers/table/index.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 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");
+const { isExternalTable } = require("../../../integrations/utils");
+const { getTableParams, getDatasourceParams, BudibaseInternalDB, } = require("../../../db/utils");
+const { getTable } = require("./utils");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -30,19 +30,16 @@ function pickApi({ tableId, table }) {
 // covers both internal and external
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const internal = yield getAllInternalTables();
+        const db = new CouchDB(ctx.appId);
+        const internalTables = yield db.allDocs(getTableParams(null, {
+            include_docs: true,
+        }));
+        const internal = internalTables.rows.map(row => (Object.assign(Object.assign({}, row.doc), { type: "internal", sourceId: BudibaseInternalDB._id })));
         const externalTables = yield db.allDocs(getDatasourceParams("plus", {
             include_docs: true,
         }));
-        const external = externalTables.rows.flatMap(tableDoc => {
-            let entities = tableDoc.doc.entities;
-            if (entities) {
-                return Object.values(entities).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: tableDoc.doc._id, sql: isSQL(tableDoc.doc) })));
-            }
-            else {
-                return [];
-            }
+        const external = externalTables.rows.flatMap(row => {
+            return Object.values(row.doc.entities || {}).map(entity => (Object.assign(Object.assign({}, entity), { type: "external", sourceId: row.doc._id })));
         });
         ctx.body = [...internal, ...external];
     });
@@ -50,7 +47,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(tableId);
+        ctx.body = yield getTable(ctx.appId, tableId);
     });
 };
 exports.save = function (ctx) {
@@ -93,7 +90,7 @@ exports.validateCSVSchema = function (ctx) {
         const { csvString, schema = {}, tableId } = ctx.request.body;
         let existingTable;
         if (tableId) {
-            existingTable = yield getTable(tableId);
+            existingTable = yield getTable(ctx.appId, tableId);
         }
         let result = yield csvParser.parse(csvString, schema);
         if (existingTable) {

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

@@ -19,18 +19,15 @@ 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 db = getAppDB();
+        const appId = ctx.appId;
+        const db = new CouchDB(appId);
         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,7 +41,8 @@ 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({
-            user: ctx.user,
+            db,
+            ctx,
             oldTable,
             dataImport,
         });
@@ -84,6 +82,7 @@ exports.save = function (ctx) {
         // update linked rows
         try {
             const linkResp = yield linkRows.updateLinks({
+                appId,
                 eventType: oldTable
                     ? linkRows.EventType.TABLE_UPDATED
                     : linkRows.EventType.TABLE_SAVE,
@@ -106,47 +105,42 @@ exports.save = function (ctx) {
         const result = yield db.put(tableToSave);
         tableToSave._rev = result.rev;
         tableToSave = yield tableSaveFunctions.after(tableToSave);
-        // has to run after, make sure it has _id
-        yield runStaticFormulaChecks(tableToSave, { oldTable });
         return tableToSave;
     });
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const appId = ctx.appId;
+        const db = new CouchDB(appId);
         const tableToDelete = yield db.get(ctx.params.tableId);
         // Delete all rows for that table
         const rows = yield db.allDocs(getRowParams(ctx.params.tableId, null, {
             include_docs: true,
         }));
         yield db.bulkDocs(rows.rows.map(row => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
-        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
-        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);
-            }
+        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(tableToDelete, { deletion: true });
-        yield cleanupAttachments(tableToDelete, { rows });
         return tableToDelete;
     });
 };
 exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield getTable(ctx.params.tableId);
+        const appId = ctx.appId;
+        const table = yield getTable(appId, ctx.params.tableId);
         const { dataImport } = ctx.request.body;
-        yield handleDataImport(ctx.user, table, dataImport);
+        yield handleDataImport(appId, ctx.user, table, dataImport);
         return table;
     });
 };

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

@@ -8,30 +8,17 @@ 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");
+const { getRowParams, generateRowID, InternalTables, } = require("../../../db/utils");
+const { isEqual } = require("lodash/fp");
 const { AutoFieldSubTypes, FieldTypes } = require("../../../constants");
-const { inputProcessing, cleanupAttachments, } = require("../../../utilities/rowProcessor");
+const { inputProcessing } = require("../../../utilities/rowProcessor");
 const { USERS_TABLE_SCHEMA, SwitchableTypes, CanSwitchTypes, } = require("../../../constants");
-const { isExternalTable, breakExternalTableId, isSQL, } = require("../../../integrations/utils");
+const { isExternalTable, breakExternalTableId, } = require("../../../integrations/utils");
 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 = (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,
-    }));
-    return db.bulkDocs(rows.rows.map(({ doc }) => {
-        columnNames.forEach(colName => delete doc[colName]);
-        return doc;
-    }));
-});
-exports.checkForColumnUpdates = (oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.checkForColumnUpdates = (db, oldTable, updatedTable) => __awaiter(void 0, void 0, void 0, function* () {
     let updatedRows = [];
     const rename = updatedTable._rename;
     let deletedColumns = [];
@@ -44,22 +31,18 @@ exports.checkForColumnUpdates = (oldTable, updatedTable) => __awaiter(void 0, vo
         const rows = yield db.allDocs(getRowParams(updatedTable._id, null, {
             include_docs: true,
         }));
-        const rawRows = rows.rows.map(({ doc }) => doc);
-        updatedRows = rawRows.map(row => {
-            row = cloneDeep(row);
+        updatedRows = rows.rows.map(({ doc }) => {
             if (rename) {
-                row[rename.updated] = row[rename.old];
-                delete row[rename.old];
+                doc[rename.updated] = doc[rename.old];
+                delete doc[rename.old];
             }
             else if (deletedColumns.length !== 0) {
-                deletedColumns.forEach(colName => delete row[colName]);
+                deletedColumns.forEach(colName => delete doc[colName]);
             }
-            return row;
+            return doc;
         });
-        // cleanup any attachments from object storage for deleted attachment columns
-        yield cleanupAttachments(updatedTable, { oldTable, rows: rawRows });
         // Update views
-        yield exports.checkForViewUpdates(updatedTable, rename, deletedColumns);
+        yield exports.checkForViewUpdates(db, updatedTable, rename, deletedColumns);
         delete updatedTable._rename;
     }
     return { rows: updatedRows, table: updatedTable };
@@ -82,11 +65,11 @@ exports.makeSureTableUpToDate = (table, tableToSave) => {
     }
     return tableToSave;
 };
-exports.handleDataImport = (user, table, dataImport) => __awaiter(void 0, void 0, void 0, function* () {
+exports.handleDataImport = (appId, user, table, dataImport) => __awaiter(void 0, void 0, void 0, function* () {
     if (!dataImport || !dataImport.csvString) {
         return table;
     }
-    const db = getAppDB();
+    const db = new CouchDB(appId);
     // 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 = [];
@@ -112,17 +95,13 @@ exports.handleDataImport = (user, table, dataImport) => __awaiter(void 0, void 0
         }
         finalData.push(row);
     }
-    yield usageQuota.update(usageQuota.Properties.ROW, finalData.length, {
-        dryRun: true,
-    });
     yield db.bulkDocs(finalData);
-    yield usageQuota.update(usageQuota.Properties.ROW, finalData.length);
     let response = yield db.put(table);
     table._rev = response._rev;
     return table;
 });
-exports.handleSearchIndexes = (table) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.handleSearchIndexes = (appId, table) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = new CouchDB(appId);
     // create relevant search indexes
     if (table.indexes && table.indexes.length > 0) {
         const currentIndexes = yield db.getIndexes();
@@ -171,9 +150,12 @@ exports.checkStaticTables = table => {
     return table;
 };
 class TableSaveFunctions {
-    constructor({ user, oldTable, dataImport }) {
-        this.db = getAppDB();
-        this.user = user;
+    constructor({ db, ctx, oldTable, dataImport }) {
+        this.db = db;
+        this.ctx = ctx;
+        if (this.ctx && this.ctx.user) {
+            this.appId = this.ctx.appId;
+        }
         this.oldTable = oldTable;
         this.dataImport = dataImport;
         // any rows that need updated
@@ -192,7 +174,7 @@ class TableSaveFunctions {
     // when confirmed valid
     mid(table) {
         return __awaiter(this, void 0, void 0, function* () {
-            let response = yield exports.checkForColumnUpdates(this.oldTable, table);
+            let response = yield exports.checkForColumnUpdates(this.db, this.oldTable, table);
             this.rows = this.rows.concat(response.rows);
             return table;
         });
@@ -200,8 +182,8 @@ class TableSaveFunctions {
     // after saving
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
-            table = yield exports.handleSearchIndexes(table);
-            table = yield exports.handleDataImport(this.user, table, this.dataImport);
+            table = yield exports.handleSearchIndexes(this.appId, table);
+            table = yield exports.handleDataImport(this.appId, this.ctx.user, table, this.dataImport);
             return table;
         });
     }
@@ -209,39 +191,30 @@ class TableSaveFunctions {
         return this.rows;
     }
 }
-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 = (datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.getAllExternalTables = (appId, datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = new CouchDB(appId);
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         throw "Datasource is not configured fully.";
     }
     return datasource.entities;
 });
-exports.getExternalTable = (datasourceId, tableName) => __awaiter(void 0, void 0, void 0, function* () {
-    const entities = yield exports.getAllExternalTables(datasourceId);
+exports.getExternalTable = (appId, datasourceId, tableName) => __awaiter(void 0, void 0, void 0, function* () {
+    const entities = yield exports.getAllExternalTables(appId, datasourceId);
     return entities[tableName];
 });
-exports.getTable = (tableId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.getTable = (appId, tableId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = new CouchDB(appId);
     if (isExternalTable(tableId)) {
         let { datasourceId, tableName } = breakExternalTableId(tableId);
-        const datasource = yield db.get(datasourceId);
-        const table = yield exports.getExternalTable(datasourceId, tableName);
-        return Object.assign(Object.assign({}, table), { sql: isSQL(datasource) });
+        return exports.getExternalTable(appId, datasourceId, tableName);
     }
     else {
         return db.get(tableId);
     }
 });
-exports.checkForViewUpdates = (table, rename, deletedColumns) => __awaiter(void 0, void 0, void 0, function* () {
-    const views = yield getViews();
+exports.checkForViewUpdates = (db, table, rename, deletedColumns) => __awaiter(void 0, void 0, void 0, function* () {
+    const views = yield getViews(db);
     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) {
@@ -297,7 +270,7 @@ exports.checkForViewUpdates = (table, rename, deletedColumns) => __awaiter(void
         // Update view if required
         if (needsUpdated) {
             const newViewTemplate = viewTemplate(view.meta);
-            yield saveView(null, view.name, newViewTemplate);
+            yield saveView(db, 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, getProdAppIDs, dbExists, } = require("@budibase/backend-core/db");
+const { getDevelopmentAppID, getDeployedAppIDs, } = require("@budibase/backend-core/db");
+const { doesDatabaseExist } = require("../../utilities");
 const { UserStatus } = require("@budibase/backend-core/constants");
-const { getAppDB } = require("@budibase/backend-core/context");
-function rawMetadata() {
+function rawMetadata(db) {
     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,10 +45,13 @@ function combineMetadataAndUser(user, metadata) {
     }
     return null;
 }
-exports.syncGlobalUsers = () => __awaiter(void 0, void 0, void 0, function* () {
+exports.syncGlobalUsers = (appId) => __awaiter(void 0, void 0, void 0, function* () {
     // sync user metadata
-    const db = getAppDB();
-    const [users, metadata] = yield Promise.all([getGlobalUsers(), rawMetadata()]);
+    const db = new CouchDB(appId);
+    const [users, metadata] = yield Promise.all([
+        getGlobalUsers(appId),
+        rawMetadata(db),
+    ]);
     const toWrite = [];
     for (let user of users) {
         const combined = yield combineMetadataAndUser(user, metadata);
@@ -83,7 +86,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 getProdAppIDs();
+            prodAppIds = yield getDeployedAppIDs(CouchDB);
         }
         else {
             prodAppIds = Object.entries(roles)
@@ -94,10 +97,10 @@ exports.syncUser = function (ctx) {
             const roleId = roles[prodAppId];
             const devAppId = getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
-                if (!(yield dbExists(appId))) {
+                if (!(yield doesDatabaseExist(appId))) {
                     continue;
                 }
-                const db = getAppDB();
+                const db = new CouchDB(appId);
                 const metadataId = generateUserMetadataID(userId);
                 let metadata;
                 try {
@@ -131,8 +134,8 @@ exports.syncUser = function (ctx) {
 };
 exports.fetchMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = getAppDB();
-        const global = yield getGlobalUsers();
+        const database = new CouchDB(ctx.appId);
+        const global = yield getGlobalUsers(ctx.appId);
         const metadata = yield rawMetadata(database);
         const users = [];
         for (let user of global) {
@@ -152,14 +155,13 @@ exports.updateSelfMetadata = function (ctx) {
         ctx.request.body._id = ctx.user._id;
         // make sure no stale rev
         delete ctx.request.body._rev;
-        // make sure no csrf token
-        delete ctx.request.body.csrfToken;
         yield exports.updateMetadata(ctx);
     });
 };
 exports.updateMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const appId = ctx.appId;
+        const db = new CouchDB(appId);
         const user = ctx.request.body;
         // this isn't applicable to the user
         delete user.roles;
@@ -169,7 +171,7 @@ exports.updateMetadata = function (ctx) {
 };
 exports.destroyMetadata = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         try {
             const dbUser = yield db.get(ctx.params.id);
             yield db.remove(dbUser._id, dbUser._rev);
@@ -195,7 +197,7 @@ exports.setFlag = function (ctx) {
             ctx.throw(400, "Must supply a 'flag' field in request body.");
         }
         const flagDocId = generateUserFlagID(userId);
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         let doc;
         try {
             doc = yield db.get(flagDocId);
@@ -212,7 +214,7 @@ exports.getFlags = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const userId = ctx.user._id;
         const docId = generateUserFlagID(userId);
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         let doc;
         try {
             doc = yield db.get(docId);

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

@@ -19,6 +19,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+const CouchDB = require("../../../db");
 const viewTemplate = require("./viewBuilder");
 const { apiFileReturn } = require("../../../utilities/fileSystem");
 const exporters = require("./exporters");
@@ -26,18 +27,18 @@ const { saveView, getView, getViews, deleteView } = require("./utils");
 const { fetchView } = require("../row");
 const { getTable } = require("../table/utils");
 const { FieldTypes } = require("../../../constants");
-const { getAppDB } = require("@budibase/backend-core/context");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    ctx.body = yield getViews();
+    const db = new CouchDB(ctx.appId);
+    ctx.body = yield getViews(db);
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     const _a = ctx.request.body, { originalName } = _a, viewToSave = __rest(_a, ["originalName"]);
     const view = viewTemplate(viewToSave);
     if (!viewToSave.name) {
         ctx.throw(400, "Cannot create view without a name");
     }
-    yield saveView(originalName, viewToSave.name, view);
+    yield saveView(db, originalName, viewToSave.name, view);
     // add views to table document
     const table = yield db.get(ctx.request.body.tableId);
     if (!table.views)
@@ -53,17 +54,18 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = Object.assign(Object.assign({}, table.views[viewToSave.name]), { name: viewToSave.name });
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     const viewName = decodeURI(ctx.params.viewName);
-    const view = yield deleteView(viewName);
+    const view = yield deleteView(db, viewName);
     const table = yield db.get(view.meta.tableId);
     delete table.views[viewName];
     yield db.put(table);
     ctx.body = view;
 });
 exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = new CouchDB(ctx.appId);
     const viewName = decodeURI(ctx.query.view);
-    const view = yield getView(viewName);
+    const view = yield getView(db, viewName);
     const format = ctx.query.format;
     if (!format || !Object.values(exporters.ExportFormats).includes(format)) {
         ctx.throw(400, "Format must be specified, either csv or json");
@@ -88,7 +90,7 @@ exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let schema = view && view.meta && view.meta.schema;
     if (!schema) {
         const tableId = ctx.params.tableId || view.meta.tableId;
-        const table = yield getTable(tableId);
+        const table = yield getTable(ctx.appId, tableId);
         schema = table.schema;
     }
     // remove any relationships

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

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { ViewNames, generateMemoryViewID, getMemoryViewParams, DocumentTypes, SEPARATOR, } = require("../../../db/utils");
 const env = require("../../../environment");
-const { getAppDB } = require("@budibase/backend-core/context");
-exports.getView = (viewName) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.getView = (db, viewName) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.SELF_HOSTED) {
         const designDoc = yield db.get("_design/database");
         return designDoc.views[viewName];
@@ -26,8 +24,7 @@ exports.getView = (viewName) => __awaiter(void 0, void 0, void 0, function* () {
         return viewDoc.view;
     }
 });
-exports.getViews = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.getViews = (db) => __awaiter(void 0, void 0, void 0, function* () {
     const response = [];
     if (env.SELF_HOSTED) {
         const designDoc = yield db.get("_design/database");
@@ -49,8 +46,7 @@ exports.getViews = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     return response;
 });
-exports.saveView = (originalName, viewName, viewTemplate) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.saveView = (db, originalName, viewName, viewTemplate) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.SELF_HOSTED) {
         const designDoc = yield db.get("_design/database");
         designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [viewName]: viewTemplate });
@@ -85,8 +81,7 @@ exports.saveView = (originalName, viewName, viewTemplate) => __awaiter(void 0, v
         yield db.put(viewDoc);
     }
 });
-exports.deleteView = (viewName) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+exports.deleteView = (db, viewName) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.SELF_HOSTED) {
         const designDoc = yield db.get("_design/database");
         const view = designDoc.views[viewName];