@budibase/server 2.0.33 → 2.0.34-alpha.1

package/dist/api/controllers/application.js

@@ -38,6 +38,7 @@ const backend_core_2 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
 const plugins_1 = require("../../utilities/plugins");
+const sdk_1 = __importDefault(require("../../sdk"));
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
 function getLayouts() {
@@ -125,11 +126,7 @@ function createInstance(template) {
             }
         }
         else if (template && template.useTemplate === "true") {
-            /* istanbul ignore next */
-            const { ok } = yield db.load(yield (0, fileSystem_1.getTemplateStream)(template));
-            if (!ok) {
-                throw "Error loading database dump from template.";
-            }
+            yield sdk_1.default.backups.importApp(appId, db, template);
         }
         else {
             // create the users table
@@ -315,7 +312,7 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
     yield creationEvents(ctx.request, app);
     // app import & template creation
     if (ctx.request.body.useTemplate === "true") {
-        const rows = yield (0, rows_1.getUniqueRows)([app.appId]);
+        const { rows } = yield (0, rows_1.getUniqueRows)([app.appId]);
         const rowCount = rows ? rows.length : 0;
         if (rowCount) {
             try {
@@ -440,7 +437,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return result;
 });
 const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const rows = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
+    const { rows } = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
     ctx.rowCount = rows.length;
 });
 const postDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/api/controllers/backup.js

@@ -8,22 +8,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { streamBackup } = require("../../utilities/fileSystem");
-const { events, context } = require("@budibase/backend-core");
-const { DocumentType } = require("../../db/utils");
-const { isQsTrue } = require("../../utilities");
-exports.exportAppDump = function (ctx) {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exportAppDump = void 0;
+const sdk_1 = __importDefault(require("../../sdk"));
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../db/utils");
+const utilities_1 = require("../../utilities");
+function exportAppDump(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let { appId, excludeRows } = ctx.query;
         const appName = decodeURI(ctx.query.appname);
-        excludeRows = isQsTrue(excludeRows);
-        const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`;
+        excludeRows = (0, utilities_1.isQsTrue)(excludeRows);
+        const backupIdentifier = `${appName}-export-${new Date().getTime()}.tar.gz`;
         ctx.attachment(backupIdentifier);
-        ctx.body = yield streamBackup(appId, excludeRows);
-        yield context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-            const appDb = context.getAppDB();
-            const app = yield appDb.get(DocumentType.APP_METADATA);
-            yield events.app.exported(app);
+        ctx.body = yield sdk_1.default.backups.streamExportApp(appId, excludeRows);
+        yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const appDb = backend_core_1.context.getAppDB();
+            const app = yield appDb.get(utils_1.DocumentType.APP_METADATA);
+            yield backend_core_1.events.app.exported(app);
         }));
     });
-};
+}
+exports.exportAppDump = exportAppDump;

package/dist/api/controllers/cloud.js

@@ -10,55 +10,57 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const env = require("../../environment");
 const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db");
-const { exportDB, sendTempFile, readFileSync, } = require("../../utilities/fileSystem");
-const { stringToReadStream } = require("../../utilities");
 const { getGlobalDB } = require("@budibase/backend-core/tenancy");
-const { create } = require("./application");
+const { streamFile } = require("../../utilities/fileSystem");
+const { stringToReadStream } = require("../../utilities");
 const { getDocParams, DocumentType, isDevAppID } = require("../../db/utils");
-function createApp(appName, appImport) {
+const { create } = require("./application");
+const { join } = require("path");
+const sdk = require("../../sdk");
+function createApp(appName, appDirectory) {
     return __awaiter(this, void 0, void 0, function* () {
         const ctx = {
             request: {
                 body: {
-                    templateString: appImport,
+                    useTemplate: true,
                     name: appName,
                 },
+                files: {
+                    templateFile: {
+                        path: appDirectory,
+                    },
+                },
             },
         };
         return create(ctx);
     });
 }
+function getAllDocType(db, docType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield db.allDocs(getDocParams(docType, null, {
+            include_docs: true,
+        }));
+        return response.rows.map(row => row.doc);
+    });
+}
 exports.exportApps = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
         ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.");
     }
     const apps = yield getAllApps({ all: true });
-    const globalDBString = yield exportDB(getGlobalDBName(), {
+    const globalDBString = yield sdk.backups.exportDB(getGlobalDBName(), {
         filter: doc => !doc._id.startsWith(DocumentType.USER),
     });
-    let allDBs = {
-        global: globalDBString,
-    };
-    for (let app of apps) {
-        const appId = app.appId || app._id;
-        // only export the dev apps as they will be the latest, the user can republish the apps
-        // in their self hosted environment
-        if (isDevAppID(appId)) {
-            allDBs[app.name] = yield exportDB(appId);
-        }
-    }
-    const filename = `cloud-export-${new Date().getTime()}.txt`;
+    // only export the dev apps as they will be the latest, the user can republish the apps
+    // in their self-hosted environment
+    let appMetadata = apps
+        .filter(app => isDevAppID(app.appId || app._id))
+        .map(app => ({ appId: app.appId || app._id, name: app.name }));
+    const tmpPath = yield sdk.backups.exportMultipleApps(appMetadata, globalDBString);
+    const filename = `cloud-export-${new Date().getTime()}.tar.gz`;
     ctx.attachment(filename);
-    ctx.body = sendTempFile(JSON.stringify(allDBs));
+    ctx.body = streamFile(tmpPath);
 });
-function getAllDocType(db, docType) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield db.allDocs(getDocParams(docType, null, {
-            include_docs: true,
-        }));
-        return response.rows.map(row => row.doc);
-    });
-}
 function hasBeenImported() {
     return __awaiter(this, void 0, void 0, function* () {
         if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
@@ -81,17 +83,18 @@ exports.importApps = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
         ctx.throw(400, "Import file is required and environment must be fresh to import apps.");
     }
-    const importFile = ctx.request.files.importFile;
-    const importString = readFileSync(importFile.path);
-    const dbs = JSON.parse(importString);
-    const globalDbImport = dbs.global;
-    // remove from the list of apps
-    delete dbs.global;
+    if (ctx.request.files.importFile.type !== "application/gzip") {
+        ctx.throw(400, "Import file must be a gzipped tarball.");
+    }
+    // initially get all the app databases out of the tarball
+    const tmpPath = sdk.backups.untarFile(ctx.request.files.importFile);
+    const globalDbImport = sdk.backups.getGlobalDBFile(tmpPath);
+    const appNames = sdk.backups.getListOfAppsInMulti(tmpPath);
     const globalDb = getGlobalDB();
     // load the global db first
     yield globalDb.load(stringToReadStream(globalDbImport));
-    for (let [appName, appImport] of Object.entries(dbs)) {
-        yield createApp(appName, appImport);
+    for (let appName of appNames) {
+        yield createApp(appName, join(tmpPath, appName));
     }
     // if there are any users make sure to remove them
     let users = yield getAllDocType(globalDb, DocumentType.USER);

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

@@ -20,6 +20,8 @@ const utils_2 = require("../../../automations/utils");
 const cache_1 = require("@budibase/backend-core/cache");
 const context_1 = require("@budibase/backend-core/context");
 const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const types_1 = require("@budibase/types");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
 const DeploymentStatus = {
@@ -87,13 +89,20 @@ function initDeployedApp(prodAppId) {
         console.log("Enabled cron triggers for deployed app..");
     });
 }
-function deployApp(deployment) {
+function deployApp(deployment, userId) {
     return __awaiter(this, void 0, void 0, function* () {
         let replication;
         try {
             const appId = (0, context_1.getAppId)();
             const devAppId = (0, db_1.getDevelopmentAppID)(appId);
             const productionAppId = (0, db_1.getProdAppID)(appId);
+            // don't try this if feature isn't allowed, will error
+            if (yield pro_1.backups.isEnabled()) {
+                // trigger backup initially
+                yield pro_1.backups.triggerAppBackup(productionAppId, types_1.AppBackupTrigger.PUBLISH, {
+                    createdBy: userId,
+                });
+            }
             const config = {
                 source: devAppId,
                 target: productionAppId,
@@ -195,7 +204,7 @@ const _deployApp = function (ctx) {
         deployment = yield storeDeploymentHistory(deployment);
         console.log("Stored deployment history");
         console.log("Deploying app...");
-        let app = yield deployApp(deployment);
+        let app = yield deployApp(deployment, ctx.user._id);
         yield backend_core_1.events.app.published(app);
         ctx.body = deployment;
     });

package/dist/api/controllers/dev.js

@@ -99,7 +99,7 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         target: appId,
     });
     try {
-        if (!env.isTest()) {
+        if (env.COUCH_DB_URL) {
             // in-memory db stalls on rollback
             yield replication.rollback();
         }

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

@@ -61,6 +61,7 @@ const _import = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             config: {
                 url: info.url,
                 defaultHeaders: [],
+                rejectUnauthorized: true,
             },
             name: info.name,
         };
@@ -149,7 +150,9 @@ function preview(ctx) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
+            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn, {
+                datasourceId: datasource._id,
+            });
             const schemaFields = {};
             if ((rows === null || rows === void 0 ? void 0 : rows.length) > 0) {
                 for (let key of [...new Set(keys)]) {
@@ -226,7 +229,9 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
+            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn, {
+                datasourceId: datasource._id,
+            });
             // remove the raw from execution incase transformer being used to hide data
             if (extra === null || extra === void 0 ? void 0 : extra.raw) {
                 delete extra.raw;

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

@@ -44,7 +44,9 @@ function patch(ctx) {
             return (0, exports.save)(ctx);
         }
         try {
-            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx));
+            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
+                datasourceId: tableId,
+            });
             ctx.status = 200;
             ctx.eventEmitter &&
                 ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
@@ -66,7 +68,9 @@ const save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         return patch(ctx);
     }
     try {
-        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx)));
+        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx), {
+            datasourceId: tableId,
+        }));
         ctx.status = 200;
         ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table);
         ctx.message = `${table.name} saved successfully`;
@@ -81,7 +85,9 @@ function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -93,7 +99,9 @@ function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -105,7 +113,9 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -120,7 +130,9 @@ function destroy(ctx) {
         const tableId = getTableId(ctx);
         let response, row;
         if (inputs.rows) {
-            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx));
+            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx), {
+                datasourceId: tableId,
+            });
             yield pro_1.quotas.removeRows(rows.length);
             response = rows;
             for (let row of rows) {
@@ -128,7 +140,9 @@ function destroy(ctx) {
             }
         }
         else {
-            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx));
+            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
+                datasourceId: tableId,
+            });
             yield pro_1.quotas.removeRow();
             response = resp.response;
             row = resp.row;
@@ -146,7 +160,9 @@ function search(ctx) {
         const tableId = getTableId(ctx);
         try {
             ctx.status = 200;
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -170,7 +186,9 @@ function fetchEnrichedRow(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -181,7 +199,9 @@ exports.fetchEnrichedRow = fetchEnrichedRow;
 const exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const tableId = getTableId(ctx);
     try {
-        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx));
+        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
+            datasourceId: tableId,
+        });
     }
     catch (err) {
         ctx.throw(400, err);

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

@@ -15,7 +15,7 @@ require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
-const { ObjectStoreBuckets } = require("../../../constants");
+const { ObjectStoreBuckets, ATTACHMENT_DIR } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
@@ -88,7 +88,7 @@ const uploadFile = function (ctx) {
             const processedFileName = `${uuid.v4()}.${fileExtension}`;
             return prepareUpload({
                 file,
-                s3Key: `${ctx.appId}/attachments/${processedFileName}`,
+                s3Key: `${ctx.appId}/${ATTACHMENT_DIR}/${processedFileName}`,
                 bucket: ObjectStoreBuckets.APPS,
             });
         }));

package/dist/api/controllers/static/templates/preview.hbs

@@ -56,6 +56,16 @@
         return
       }
 
+      // If this is a custom event, try and handle it
+      if (parsed.runtimeEvent) {
+        const { name, payload } = parsed
+        if (window.handleBuilderRuntimeEvent) {
+          window.handleBuilderRuntimeEvent(name, payload)
+        }
+        return
+      }
+
+      // Otherwise this is a full reload message
       // Extract data from message
       const {
         selectedComponentId,

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

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { FieldTypes, FormulaTypes } = require("../../../constants");
-const { getAllInternalTables, clearColumns } = require("./utils");
+const { 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");
+const sdk = require("../../../sdk");
 function isStaticFormula(column) {
     return (column.type === FieldTypes.FORMULA &&
         column.formulaType === FormulaTypes.STATIC);
@@ -46,7 +47,7 @@ function getFormulaThatUseColumn(table, columnNames) {
 function checkIfFormulaNeedsCleared(table, { oldTable, deletion }) {
     return __awaiter(this, void 0, void 0, function* () {
         // start by retrieving all tables, remove the current table from the list
-        const tables = (yield getAllInternalTables()).filter(tbl => tbl._id !== table._id);
+        const tables = (yield sdk.tables.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
@@ -96,7 +97,7 @@ function updateRelatedFormulaLinksOnTables(table, { deletion } = { deletion: fal
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
         // start by retrieving all tables, remove the current table from the list
-        const tables = (yield getAllInternalTables()).filter(tbl => tbl._id !== table._id);
+        const tables = (yield sdk.tables.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

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { buildExternalTableId, breakExternalTableId, } = require("../../../integrations/utils");
-const { getTable, generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
+const { generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
 const { DataSourceOperation, FieldTypes, RelationshipTypes, } = require("../../../constants");
 const { makeExternalQuery } = require("../../../integrations/base/query");
 const { cloneDeep } = require("lodash/fp");
@@ -17,6 +17,7 @@ const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
+const sdk = require("../../../sdk");
 function makeTableRequest(datasource, operation, table, tables, oldTable = null, renamed = null) {
     return __awaiter(this, void 0, void 0, function* () {
         const json = {
@@ -150,7 +151,7 @@ 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 sdk.tables.getTable(ctx.request.body._id);
         }
         if (hasTypeChanged(tableToSave, oldTable)) {
             ctx.throw(400, "A column type has changed.");
@@ -221,7 +222,7 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tableToDelete = yield getTable(ctx.params.tableId);
+        const tableToDelete = yield sdk.tables.getTable(ctx.params.tableId);
         if (!tableToDelete || !tableToDelete.created) {
             ctx.throw(400, "Cannot delete tables which weren't created in Budibase.");
         }
@@ -239,7 +240,7 @@ exports.destroy = function (ctx) {
 };
 exports.bulkImport = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield getTable(ctx.params.tableId);
+        const table = yield sdk.tables.getTable(ctx.params.tableId);
         const { dataImport } = ctx.request.body;
         if (!dataImport || !dataImport.schema || !dataImport.csvString) {
             ctx.throw(400, "Provided data import information is invalid.");

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

@@ -14,8 +14,8 @@ 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 { events } = require("@budibase/backend-core");
+const sdk = require("../../../sdk");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -32,7 +32,7 @@ function pickApi({ tableId, table }) {
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
-        const internal = yield getAllInternalTables();
+        const internal = yield sdk.tables.getAllInternalTables();
         const externalTables = yield db.allDocs(getDatasourceParams("plus", {
             include_docs: true,
         }));
@@ -51,7 +51,7 @@ exports.fetch = function (ctx) {
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
-        ctx.body = yield getTable(tableId);
+        ctx.body = yield sdk.tables.getTable(tableId);
     });
 };
 exports.save = function (ctx) {
@@ -106,7 +106,7 @@ exports.validateCSVSchema = function (ctx) {
         const { csvString, schema = {}, tableId } = ctx.request.body;
         let existingTable;
         if (tableId) {
-            existingTable = yield getTable(tableId);
+            existingTable = yield sdk.tables.getTable(tableId);
         }
         let result = yield csvParser.parse(csvString, schema);
         if (existingTable) {

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

@@ -19,6 +19,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulkImport = exports.destroy = exports.save = void 0;
 const linkedRows_1 = require("../../../db/linkedRows");
@@ -32,6 +35,8 @@ const bulkFormula_1 = require("./bulkFormula");
 const pro_1 = require("@budibase/pro");
 const lodash_1 = require("lodash");
 const fp_1 = require("lodash/fp");
+const environment_2 = __importDefault(require("../../../environment"));
+const sdk_1 = __importDefault(require("../../../sdk"));
 function checkAutoColumns(table, oldTable) {
     if (!table.schema) {
         return table;
@@ -150,7 +155,9 @@ function destroy(ctx) {
             include_docs: true,
         }));
         yield db.bulkDocs(rows.rows.map((row) => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
-        yield pro_1.quotas.removeRows(rows.rows.length);
+        yield pro_1.quotas.removeRows(rows.rows.length, {
+            tableId: ctx.params.tableId,
+        });
         // update linked rows
         yield (0, linkedRows_1.updateLinks)({
             eventType: linkedRows_1.EventType.TABLE_DELETE,
@@ -159,7 +166,7 @@ function destroy(ctx) {
         // don't remove the table itself until very end
         yield db.remove(tableToDelete);
         // remove table search index
-        if (!(0, environment_1.isTest)()) {
+        if (!(0, environment_1.isTest)() || environment_2.default.COUCH_DB_URL) {
             const currentIndexes = yield db.getIndexes();
             const existingIndex = currentIndexes.indexes.find((existing) => existing.name === `search:${ctx.params.tableId}`);
             if (existingIndex) {
@@ -178,7 +185,7 @@ function destroy(ctx) {
 exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield (0, utils_2.getTable)(ctx.params.tableId);
+        const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
         const { dataImport } = ctx.request.body;
         yield (0, utils_2.handleDataImport)(ctx.user, table, dataImport);
         return table;