From e6589fd4c11ca6b063d95606c619a042b05f474a Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 21 Nov 2022 10:07:51 +0000 Subject: [PATCH] Require params on db.remove --- packages/server/src/api/controllers/table/internal.ts | 8 ++++---- packages/types/src/sdk/db.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts index a50009b1f6..ee98852a8f 100644 --- a/packages/server/src/api/controllers/table/internal.ts +++ b/packages/server/src/api/controllers/table/internal.ts @@ -2,7 +2,7 @@ import { updateLinks, EventType } from "../../../db/linkedRows" import { getRowParams, generateTableID } from "../../../db/utils" import { FieldTypes } from "../../../constants" import { TableSaveFunctions, hasTypeChanged, handleDataImport } from "./utils" -const { getAppDB } = require("@budibase/backend-core/context") +import { context } from "@budibase/backend-core" import { isTest } from "../../../environment" import { cleanupAttachments, @@ -35,7 +35,7 @@ function checkAutoColumns(table: Table, oldTable: Table) { } export async function save(ctx: any) { - const db = getAppDB() + const db = context.getAppDB() const { dataImport, ...rest } = ctx.request.body let tableToSave = { type: "table", @@ -138,7 +138,7 @@ export async function save(ctx: any) { } export async function destroy(ctx: any) { - const db = getAppDB() + const db = context.getAppDB() const tableToDelete = await db.get(ctx.params.tableId) // Delete all rows for that table @@ -161,7 +161,7 @@ export async function destroy(ctx: any) { }) // don't remove the table itself until very end - await db.remove(tableToDelete) + await db.remove(tableToDelete._id, tableToDelete._rev) // remove table search index if (!isTest() || env.COUCH_DB_URL) { diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts index 44b4735882..df873911c8 100644 --- a/packages/types/src/sdk/db.ts +++ b/packages/types/src/sdk/db.ts @@ -50,7 +50,7 @@ export interface Database { exists(): Promise checkSetup(): Promise> get(id?: string): Promise - remove(id?: string, rev?: string): Promise + remove(id: string, rev: string): Promise put( document: AnyDocument, opts?: DatabasePutOpts