Merge pull request #14695 from Budibase/fix/related-rows-dont-exist

Handle internal relationships referencing rows that don't exist
Budibase · Oct 9, 2024 · 9812e88 · 9812e88
2 parents abd7b3b + 64492dc
commit 9812e88
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -213,17 +213,21 @@ export class DatabaseImpl implements Database {
 
  async getMultiple<T extends Document>(
  ids: string[],
- opts?: { allowMissing?: boolean }
+ opts?: { allowMissing?: boolean; excludeDocs?: boolean }
  ): Promise<T[]> {
  // get unique
  ids = [...new Set(ids)]
+ const includeDocs = !opts?.excludeDocs
  const response = await this.allDocs<T>({
  keys: ids,
- include_docs: true,
+ include_docs: includeDocs,
  })
  const rowUnavailable = (row: RowResponse<T>) => {
  // row is deleted - key lookup can return this
- if (row.doc == null || ("deleted" in row.value && row.value.deleted)) {
+ if (
+ (includeDocs && row.doc == null) ||
+ (row.value && "deleted" in row.value && row.value.deleted)
+ ) {
  return true
  }
  return row.error === "not_found"
@@ -237,7 +241,7 @@ export class DatabaseImpl implements Database {
  const missingIds = missing.map(row => row.key).join(", ")
  throw new Error(`Unable to get documents: ${missingIds}`)
  }
- return rows.map(row => row.doc!)
+ return rows.map(row => (includeDocs ? row.doc! : row.value))
  }
 
  async remove(idOrDoc: string | Document, rev?: string) {

diff --git a/packages/server/src/db/linkedRows/LinkController.ts b/packages/server/src/db/linkedRows/LinkController.ts
@@ -221,9 +221,15 @@ class LinkController {
  link.id !== row._id && link.fieldName === linkedSchema.name
  )
 
+ // check all the related rows exist
+ const foundRecords = await this._db.getMultiple(
+ links.map(l => l.id),
+ { allowMissing: true, excludeDocs: true }
+ )
+
  // The 1 side of 1:N is already related to something else
  // You must remove the existing relationship
- if (links.length > 0) {
+ if (foundRecords.length > 0) {
  throw new Error(
  `1:N Relationship Error: Record already linked to another.`
  )

diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
@@ -133,7 +133,7 @@ export interface Database {
  exists(docId: string): Promise<boolean>
  getMultiple<T extends Document>(
  ids: string[],
- opts?: { allowMissing?: boolean }
+ opts?: { allowMissing?: boolean; excludeDocs?: boolean }
  ): Promise<T[]>
  remove(idOrDoc: Document): Promise<Nano.DocumentDestroyResponse>
  remove(idOrDoc: string, rev?: string): Promise<Nano.DocumentDestroyResponse>