From 863587ef300cf138faffa863696434038ebfc273 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 12:25:25 +0100
Subject: [PATCH 001/128] Fix scripts

---
 scripts/add-app-migration.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/add-app-migration.js b/scripts/add-app-migration.js
index a58d3a4fbe..a4e01be635 100644
--- a/scripts/add-app-migration.js
+++ b/scripts/add-app-migration.js
@@ -21,7 +21,9 @@ const generateTimestamp = () => {
 }
 
 const createMigrationFile = () => {
-  const migrationFilename = `${generateTimestamp()}_${title}`
+  const migrationFilename = `${generateTimestamp()}_${title
+    .replace(/-/g, "_")
+    .replace(/ /g, "_")}`
   const migrationsDir = "../packages/server/src/appMigrations"
 
   const template = `const migration = async () => {

From 90db9efb7045d0dfbf7db6e294442d64e150e816 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 12:43:39 +0100
Subject: [PATCH 002/128] Allow skipping migrations

---
 packages/backend-core/src/environment.ts        | 1 +
 packages/server/src/middleware/appMigrations.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 138dbbd9e0..66c91b19fb 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -183,6 +183,7 @@ const environment = {
     environment[key] = value
   },
   ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M",
+  SKIP_APP_MIGRATIONS: process.env.SKIP_APP_MIGRATIONS || false,
 }
 
 // clean up any environment variable edge cases
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index 36e021c7ed..1fb13094c6 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -1,9 +1,14 @@
 import { UserCtx } from "@budibase/types"
 import { checkMissingMigrations } from "../appMigrations"
+import { env } from "@budibase/backend-core"
 
 export default async (ctx: UserCtx, next: any) => {
   const { appId } = ctx
 
+  if (env.SKIP_APP_MIGRATIONS) {
+    return next()
+  }
+
   if (!appId) {
     return next()
   }

From f484c6dabd9b135128115707d1627d625c92f95d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 12:43:53 +0100
Subject: [PATCH 003/128] Fix initial run

---
 packages/server/src/appMigrations/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index b382d8b533..0758b9f324 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -17,7 +17,7 @@ export const getLatestMigrationId = () =>
     .sort()
     .reverse()[0]
 
-const getTimestamp = (versionId: string) => versionId?.split("_")[0]
+const getTimestamp = (versionId: string) => versionId?.split("_")[0] || ""
 
 export async function checkMissingMigrations(
   ctx: UserCtx,

From 61e16b63a510ec19dcc47a03f9bd5ceb0a95a743 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 12:55:14 +0100
Subject: [PATCH 004/128] Fix initial run

---
 packages/server/src/appMigrations/appMigrationMetadata.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts
index 202e78d964..d87ddff3ef 100644
--- a/packages/server/src/appMigrations/appMigrationMetadata.ts
+++ b/packages/server/src/appMigrations/appMigrationMetadata.ts
@@ -33,7 +33,7 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
   let version
   try {
     metadata = await getFromDB(appId)
-    version = metadata.version
+    version = metadata.version || ""
   } catch (err: any) {
     if (err.status !== 404) {
       throw err

From 4a481877def0483bf3864af5e0f11467835356d9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 12:55:52 +0100
Subject: [PATCH 005/128] Add empty migration

---
 packages/server/src/appMigrations/migrations.ts             | 6 ++++++
 .../migrations/20231229122514_update_link_documents.ts      | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts

diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts
index d66e2e8895..544e702867 100644
--- a/packages/server/src/appMigrations/migrations.ts
+++ b/packages/server/src/appMigrations/migrations.ts
@@ -2,6 +2,12 @@
 
 import { AppMigration } from "."
 
+import m20231229122514_update_link_documents from "./migrations/20231229122514_update_link_documents"
+
 export const MIGRATIONS: AppMigration[] = [
   // Migrations will be executed sorted by id
+  {
+    id: "20231229122514_update_link_documents",
+    func: m20231229122514_update_link_documents
+  },
 ]
diff --git a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
new file mode 100644
index 0000000000..f23f72e070
--- /dev/null
+++ b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
@@ -0,0 +1,5 @@
+const migration = async () => {
+  // Add your migration logic here
+}
+
+export default migration

From e1c37e75a41a6613080c638e088d4a5dfe7c1753 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 13:03:59 +0100
Subject: [PATCH 006/128] Add allLinkDocs utils

---
 packages/server/src/db/utils.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts
index 1712563085..a487c562b6 100644
--- a/packages/server/src/db/utils.ts
+++ b/packages/server/src/db/utils.ts
@@ -1,5 +1,5 @@
 import newid from "./newid"
-import { db as dbCore } from "@budibase/backend-core"
+import { context, db as dbCore } from "@budibase/backend-core"
 import {
   DocumentType,
   FieldSchema,
@@ -7,6 +7,7 @@ import {
   VirtualDocumentType,
   INTERNAL_TABLE_SOURCE_ID,
   DatabaseQueryOpts,
+  LinkDocument,
 } from "@budibase/types"
 import { FieldTypes } from "../constants"
 
@@ -127,10 +128,24 @@ export function generateLinkID(
 /**
  * Gets parameters for retrieving link docs, this is a utility function for the getDocParams function.
  */
-export function getLinkParams(otherProps: any = {}) {
+function getLinkParams(otherProps: Partial<DatabaseQueryOpts> = {}) {
   return getDocParams(DocumentType.LINK, null, otherProps)
 }
 
+/**
+ * Gets all the link docs document from the current app db.
+ */
+export async function allLinkDocs() {
+  const db = context.getAppDB()
+
+  const response = await db.allDocs<LinkDocument>(
+    getLinkParams({
+      include_docs: true,
+    })
+  )
+  return response.rows.map(row => row.doc!)
+}
+
 /**
  * Generates a new layout ID.
  * @returns The new layout ID which the layout doc can be stored under.

From 4a1b99a9dc5f1b650a4ffe3cfa7602b51f6eedb3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 13:32:45 +0100
Subject: [PATCH 007/128] Add migration

---
 .../20231229122514_update_link_documents.ts   | 23 ++++++++++++++++++-
 packages/types/src/documents/app/links.ts     |  1 +
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
index f23f72e070..e1e1d4efc6 100644
--- a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
+++ b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
@@ -1,5 +1,26 @@
+import { SEPARATOR, context } from "@budibase/backend-core"
+import { allLinkDocs } from "../../db/utils"
+
 const migration = async () => {
-  // Add your migration logic here
+  const linkDocs = await allLinkDocs()
+
+  const docsToUpdate = []
+  for (const linkDoc of linkDocs) {
+    if (linkDoc.tableId) {
+      // It already had the required data
+      continue
+    }
+
+    linkDoc.tableId = [linkDoc.doc1.tableId, linkDoc.doc2.tableId]
+      .sort()
+      .join(SEPARATOR)
+    docsToUpdate.push(linkDoc)
+  }
+
+  if (docsToUpdate.length) {
+    const db = context.getAppDB()
+    await db.bulkDocs(docsToUpdate)
+  }
 }
 
 export default migration
diff --git a/packages/types/src/documents/app/links.ts b/packages/types/src/documents/app/links.ts
index ae7e4de78e..2a9595d99f 100644
--- a/packages/types/src/documents/app/links.ts
+++ b/packages/types/src/documents/app/links.ts
@@ -8,6 +8,7 @@ export interface LinkInfo {
 
 export interface LinkDocument extends Document {
   type: string
+  tableId: string
   doc1: LinkInfo
   doc2: LinkInfo
 }

From e265cc635c3b1f0ad66773078b1b657cbd4c0589 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 29 Dec 2023 13:41:46 +0100
Subject: [PATCH 008/128] Create link docs to new docs

---
 packages/backend-core/src/users/db.ts              |  2 +-
 .../20231229122514_update_link_documents.ts        | 14 ++++++++++----
 packages/server/src/db/linkedRows/LinkDocument.ts  |  7 ++++++-
 packages/server/src/db/linkedRows/index.ts         |  1 -
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 326bed3cc5..01fa4899d1 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -2,7 +2,7 @@ import env from "../environment"
 import * as eventHelpers from "./events"
 import * as accountSdk from "../accounts"
 import * as cache from "../cache"
-import { doInTenant, getGlobalDB, getIdentity, getTenantId } from "../context"
+import { getGlobalDB, getIdentity, getTenantId } from "../context"
 import * as dbUtils from "../db"
 import { EmailUnavailableError, HTTPError } from "../errors"
 import * as platform from "../platform"
diff --git a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
index e1e1d4efc6..adaa0653c4 100644
--- a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
+++ b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
@@ -1,5 +1,6 @@
-import { SEPARATOR, context } from "@budibase/backend-core"
+import { context } from "@budibase/backend-core"
 import { allLinkDocs } from "../../db/utils"
+import LinkDocumentImpl from "../../db/linkedRows/LinkDocument"
 
 const migration = async () => {
   const linkDocs = await allLinkDocs()
@@ -11,9 +12,14 @@ const migration = async () => {
       continue
     }
 
-    linkDoc.tableId = [linkDoc.doc1.tableId, linkDoc.doc2.tableId]
-      .sort()
-      .join(SEPARATOR)
+    linkDoc.tableId = new LinkDocumentImpl(
+      linkDoc.doc1.tableId,
+      linkDoc.doc1.fieldName,
+      linkDoc.doc1.rowId,
+      linkDoc.doc2.tableId,
+      linkDoc.doc2.fieldName,
+      linkDoc.doc2.rowId
+    ).tableId
     docsToUpdate.push(linkDoc)
   }
 
diff --git a/packages/server/src/db/linkedRows/LinkDocument.ts b/packages/server/src/db/linkedRows/LinkDocument.ts
index 234f43cb48..05097ed84f 100644
--- a/packages/server/src/db/linkedRows/LinkDocument.ts
+++ b/packages/server/src/db/linkedRows/LinkDocument.ts
@@ -1,6 +1,6 @@
 import { generateLinkID } from "../utils"
 import { FieldTypes } from "../../constants"
-import { LinkDocument } from "@budibase/types"
+import { LinkDocument, SEPARATOR } from "@budibase/types"
 
 /**
  * Creates a new link document structure which can be put to the database. It is important to
@@ -17,6 +17,7 @@ import { LinkDocument } from "@budibase/types"
 class LinkDocumentImpl implements LinkDocument {
   _id: string
   type: string
+  tableId: string
   doc1: {
     rowId: string
     fieldName: string
@@ -54,7 +55,11 @@ class LinkDocumentImpl implements LinkDocument {
       fieldName: fieldName2,
       rowId: rowId2,
     }
+    this.tableId = [this.doc1.tableId, this.doc2.tableId].sort().join(SEPARATOR)
   }
+  _rev?: string | undefined
+  createdAt?: string | number | undefined
+  updatedAt?: string | undefined
 }
 
 export default LinkDocumentImpl
diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts
index 7af3f9392f..934b9d4a75 100644
--- a/packages/server/src/db/linkedRows/index.ts
+++ b/packages/server/src/db/linkedRows/index.ts
@@ -18,7 +18,6 @@ import {
   Row,
   LinkDocumentValue,
   FieldType,
-  LinkDocument,
   ContextUser,
 } from "@budibase/types"
 import sdk from "../../sdk"

From 896c262c943ae0874fba548f398ffe6aa930f47b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 10:52:17 +0200
Subject: [PATCH 009/128] Add readonly option in view columns

---
 .../backend/DataTable/ViewV2DataTable.svelte  |  1 +
 .../grid/controls/ColumnsSettingButton.svelte | 41 ++++++++++++++-----
 .../src/components/grid/layout/Grid.svelte    |  3 +-
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 3b628c7b53..9b0e45a1b2 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -28,6 +28,7 @@
     showAvatars={false}
     on:updatedatasource={handleGridViewUpdate}
     isCloud={$admin.cloud}
+    allowReadonlyColumns
   >
     <svelte:fragment slot="filter">
       <GridFilterButton />
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 0a85e41966..70655bd5a3 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -1,9 +1,11 @@
 <script>
   import { getContext } from "svelte"
-  import { ActionButton, Popover, Icon } from "@budibase/bbui"
+  import { ActionButton, Popover, Icon, notifications } from "@budibase/bbui"
   import { getColumnIcon } from "../lib/utils"
   import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
 
+  export let allowReadonlyColumns = false
+
   const { columns, datasource, stickyColumn, dispatch } = getContext("grid")
 
   let open = false
@@ -14,9 +16,14 @@
 
   const toggleColumn = async (column, permission) => {
     const visible = permission !== PERMISSION_OPTIONS.HIDDEN
+    const readonly = permission === PERMISSION_OPTIONS.READONLY
 
-    datasource.actions.addSchemaMutation(column.name, { visible })
-    await datasource.actions.saveSchemaMutations()
+    datasource.actions.addSchemaMutation(column.name, { visible, readonly })
+    try {
+      await datasource.actions.saveSchemaMutations()
+    } catch (e) {
+      notifications.error(e.message)
+    }
     dispatch(visible ? "show-column" : "hide-column")
   }
 
@@ -27,17 +34,29 @@
 
   const PERMISSION_OPTIONS = {
     WRITABLE: "writable",
+    READONLY: "readonly",
     HIDDEN: "hidden",
   }
 
-  const options = [
-    { icon: "Edit", value: PERMISSION_OPTIONS.WRITABLE, tooltip: "Writable" },
-    {
-      icon: "VisibilityOff",
-      value: PERMISSION_OPTIONS.HIDDEN,
-      tooltip: "Hidden",
-    },
-  ]
+  const EDIT_OPTION = {
+    icon: "Edit",
+    value: PERMISSION_OPTIONS.WRITABLE,
+    tooltip: "Writable",
+  }
+  const READONLY_OPTION = {
+    icon: "Visibility",
+    value: PERMISSION_OPTIONS.READONLY,
+    tooltip: "Read only",
+  }
+  const HIDDEN_OPTION = {
+    icon: "VisibilityOff",
+    value: PERMISSION_OPTIONS.HIDDEN,
+    tooltip: "Hidden",
+  }
+
+  $: options = allowReadonlyColumns
+    ? [EDIT_OPTION, READONLY_OPTION, HIDDEN_OPTION]
+    : [EDIT_OPTION, HIDDEN_OPTION]
 
   function columnToPermissionOptions(column) {
     if (!column.visible) {
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 0a3075a61f..97ccc60f8c 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -57,6 +57,7 @@
   export let buttons = null
   export let darkMode
   export let isCloud = null
+  export let allowReadonlyColumns = false
 
   // Unique identifier for DOM nodes inside this instance
   const gridID = `grid-${Math.random().toString().slice(2)}`
@@ -153,7 +154,7 @@
       <div class="controls-left">
         <slot name="filter" />
         <SortButton />
-        <ColumnsSettingButton />
+        <ColumnsSettingButton {allowReadonlyColumns} />
         <SizeButton />
         <slot name="controls" />
       </div>

From 1dd5c67392e92b0fbd21e60e67a58197f7a03e7f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 10:55:25 +0200
Subject: [PATCH 010/128] Allow disable specific options

---
 .../src/components/grid/controls/ColumnsSettingButton.svelte   | 2 +-
 .../components/grid/controls/ToggleActionButtonGroup.svelte    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 70655bd5a3..7e330b77e4 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -92,7 +92,7 @@
         <ToggleActionButtonGroup
           disabled
           value={PERMISSION_OPTIONS.WRITABLE}
-          {options}
+          options={options.map(o => ({ ...o, disabled: true }))}
         />
       {/if}
       {#each $columns as column}
diff --git a/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte b/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte
index e705b5016d..2e62c593d1 100644
--- a/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte
@@ -7,7 +7,6 @@
 
   export let value
   export let options
-  export let disabled
 </script>
 
 <div class="permissionPicker">
@@ -15,7 +14,7 @@
     <AbsTooltip text={option.tooltip} type={TooltipType.Info}>
       <ActionButton
         on:click={() => dispatch("click", option.value)}
-        {disabled}
+        disabled={option.disabled}
         size="S"
         icon={option.icon}
         quiet

From 8e72f1f0facd831a62c385fb88754d0a36972710 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 11:07:30 +0200
Subject: [PATCH 011/128] Lock readonly

---
 packages/builder/src/stores/portal/licensing.js        |  6 ++++++
 .../grid/controls/ColumnsSettingButton.svelte          | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 179d0918bb..1378a734e8 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -138,6 +138,11 @@ export const createLicensingStore = () => {
       const isViewPermissionsEnabled = license.features.includes(
         Constants.Features.VIEW_PERMISSIONS
       )
+
+      const isViewReadonlyColumnsEnabled = license.features.includes(
+        Constants.Features.VIEW_READONLY_COLUMNS
+      )
+
       store.update(state => {
         return {
           ...state,
@@ -157,6 +162,7 @@ export const createLicensingStore = () => {
           triggerAutomationRunEnabled,
           isViewPermissionsEnabled,
           perAppBuildersEnabled,
+          isViewReadonlyColumnsEnabled,
         }
       })
     },
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 7e330b77e4..8faf603b80 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Popover, Icon, notifications } from "@budibase/bbui"
+  import { licensing } from "stores/portal"
   import { getColumnIcon } from "../lib/utils"
   import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
 
@@ -32,6 +33,8 @@
     return hidden ? `Columns (${hidden} restricted)` : "Columns"
   }
 
+  $: isViewReadonlyColumnsEnabled = $licensing.isViewReadonlyColumnsEnabled
+
   const PERMISSION_OPTIONS = {
     WRITABLE: "writable",
     READONLY: "readonly",
@@ -43,10 +46,13 @@
     value: PERMISSION_OPTIONS.WRITABLE,
     tooltip: "Writable",
   }
-  const READONLY_OPTION = {
+  $: READONLY_OPTION = {
     icon: "Visibility",
     value: PERMISSION_OPTIONS.READONLY,
-    tooltip: "Read only",
+    tooltip: isViewReadonlyColumnsEnabled
+      ? "Read only"
+      : "Read only (premium feature)",
+    disabled: !isViewReadonlyColumnsEnabled,
   }
   const HIDDEN_OPTION = {
     icon: "VisibilityOff",

From b68940bca44818a0e20dd5ab2abb19b095e2eeed Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 11:26:12 +0200
Subject: [PATCH 012/128] Map readonly

---
 .../src/components/grid/controls/ColumnsSettingButton.svelte  | 4 ++++
 packages/frontend-core/src/components/grid/stores/columns.js  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 8faf603b80..c07adf9fcb 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -69,6 +69,10 @@
       return PERMISSION_OPTIONS.HIDDEN
     }
 
+    if (column.readonly) {
+      return PERMISSION_OPTIONS.READONLY
+    }
+
     return PERMISSION_OPTIONS.WRITABLE
   }
 </script>
diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js
index a3281be936..b76dcbfe0e 100644
--- a/packages/frontend-core/src/components/grid/stores/columns.js
+++ b/packages/frontend-core/src/components/grid/stores/columns.js
@@ -146,6 +146,7 @@ export const initialise = context => {
             schema: fieldSchema,
             width: fieldSchema.width || oldColumn?.width || DefaultColumnWidth,
             visible: fieldSchema.visible ?? true,
+            readonly: fieldSchema.readonly,
             order: fieldSchema.order ?? oldColumn?.order,
             primaryDisplay: field === primaryDisplay,
           }

From fbfe85c903c5d0b95419e6f5071d594204e566a7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 11:43:28 +0200
Subject: [PATCH 013/128] Mark readonly as restricted

---
 .../components/grid/controls/ColumnsSettingButton.svelte    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index c07adf9fcb..fd0afd48f2 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -29,8 +29,10 @@
   }
 
   const getText = columns => {
-    const hidden = columns.filter(col => !col.visible).length
-    return hidden ? `Columns (${hidden} restricted)` : "Columns"
+    const restricted = columns.filter(
+      col => !col.visible || col.readonly
+    ).length
+    return restricted ? `Columns (${restricted} restricted)` : "Columns"
   }
 
   $: isViewReadonlyColumnsEnabled = $licensing.isViewReadonlyColumnsEnabled

From 6ce0b3c368356459ad4d683e2f28f7acec549d66 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 11:46:57 +0200
Subject: [PATCH 014/128] Copy change

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 4 ++--
 packages/server/src/sdk/app/views/index.ts          | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 8069fadf10..962d6e82a3 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -424,7 +424,7 @@ describe.each([
         await config.api.viewV2.create(newView, {
           status: 400,
           body: {
-            message: "Readonly fields are not enabled for your tenant",
+            message: "Readonly fields are not enabled",
             status: 400,
           },
         })
@@ -690,7 +690,7 @@ describe.each([
       await config.api.viewV2.update(view, {
         status: 400,
         body: {
-          message: "Readonly fields are not enabled for your tenant",
+          message: "Readonly fields are not enabled",
         },
       })
     })
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index ea05ecf512..18ab94be21 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -55,10 +55,7 @@ async function guardViewSchema(
 
     if (viewSchema[field].readonly) {
       if (!(await features.isViewReadonlyColumnsEnabled())) {
-        throw new HTTPError(
-          `Readonly fields are not enabled for your tenant`,
-          400
-        )
+        throw new HTTPError(`Readonly fields are not enabled`, 400)
       }
 
       if (isRequired(tableSchemaField.constraints)) {

From 4dbfa28febd21889e271af769a1619cd5d2c44db Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 17:12:46 +0200
Subject: [PATCH 015/128] Move licence check out of frontend-core

---
 .../backend/DataTable/ViewV2DataTable.svelte         |  5 +++--
 .../grid/controls/ColumnsSettingButton.svelte        | 12 +++++-------
 .../src/components/grid/layout/Grid.svelte           |  8 ++++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 9b0e45a1b2..45cdeeee07 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import { viewsV2 } from "stores/builder"
-  import { admin } from "stores/portal"
+  import { admin, licensing } from "stores/portal"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
@@ -28,7 +28,8 @@
     showAvatars={false}
     on:updatedatasource={handleGridViewUpdate}
     isCloud={$admin.cloud}
-    allowReadonlyColumns
+    showReadonlyColumnsOptions
+    canSetReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
   >
     <svelte:fragment slot="filter">
       <GridFilterButton />
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index fd0afd48f2..6b381208dd 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -1,11 +1,11 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Popover, Icon, notifications } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
   import { getColumnIcon } from "../lib/utils"
   import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
 
-  export let allowReadonlyColumns = false
+  export let showReadonlyColumnsOptions = false
+  export let canSetReadonlyColumns = false
 
   const { columns, datasource, stickyColumn, dispatch } = getContext("grid")
 
@@ -35,8 +35,6 @@
     return restricted ? `Columns (${restricted} restricted)` : "Columns"
   }
 
-  $: isViewReadonlyColumnsEnabled = $licensing.isViewReadonlyColumnsEnabled
-
   const PERMISSION_OPTIONS = {
     WRITABLE: "writable",
     READONLY: "readonly",
@@ -51,10 +49,10 @@
   $: READONLY_OPTION = {
     icon: "Visibility",
     value: PERMISSION_OPTIONS.READONLY,
-    tooltip: isViewReadonlyColumnsEnabled
+    tooltip: canSetReadonlyColumns
       ? "Read only"
       : "Read only (premium feature)",
-    disabled: !isViewReadonlyColumnsEnabled,
+    disabled: !canSetReadonlyColumns,
   }
   const HIDDEN_OPTION = {
     icon: "VisibilityOff",
@@ -62,7 +60,7 @@
     tooltip: "Hidden",
   }
 
-  $: options = allowReadonlyColumns
+  $: options = showReadonlyColumnsOptions
     ? [EDIT_OPTION, READONLY_OPTION, HIDDEN_OPTION]
     : [EDIT_OPTION, HIDDEN_OPTION]
 
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 97ccc60f8c..8d95540fa7 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -57,7 +57,8 @@
   export let buttons = null
   export let darkMode
   export let isCloud = null
-  export let allowReadonlyColumns = false
+  export let showReadonlyColumnsOptions = false
+  export let canSetReadonlyColumns = false
 
   // Unique identifier for DOM nodes inside this instance
   const gridID = `grid-${Math.random().toString().slice(2)}`
@@ -154,7 +155,10 @@
       <div class="controls-left">
         <slot name="filter" />
         <SortButton />
-        <ColumnsSettingButton {allowReadonlyColumns} />
+        <ColumnsSettingButton
+          {showReadonlyColumnsOptions}
+          {canSetReadonlyColumns}
+        />
         <SizeButton />
         <slot name="controls" />
       </div>

From 2a189c4f8e8a4d9e9a10b9e4bb7b89e92960d2e8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 11:33:34 +0200
Subject: [PATCH 016/128] Readonly cells

---
 .../frontend-core/src/components/grid/cells/DataCell.svelte    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte
index 0156313d03..30d7e39921 100644
--- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte
@@ -33,7 +33,8 @@
     column.schema.autocolumn ||
     column.schema.disabled ||
     column.schema.type === "formula" ||
-    (!$config.canEditRows && !row._isNewRow)
+    (!$config.canEditRows && !row._isNewRow) ||
+    column.schema.readonly
 
   // Register this cell API if the row is focused
   $: {

From 54446552374e864227a5f70563b16a412d9f3798 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 31 May 2024 11:14:41 +0200
Subject: [PATCH 017/128] Change anyHidden to anyRestricted

---
 .../grid/controls/ColumnsSettingButton.svelte      | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 6b381208dd..4ed91f070f 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -12,8 +12,9 @@
   let open = false
   let anchor
 
-  $: anyHidden = $columns.some(col => !col.visible)
-  $: text = getText($columns)
+  $: restrictedColumns = $columns.filter(col => !col.visible || col.readonly)
+  $: anyRestricted = restrictedColumns.length
+  $: text = anyRestricted ? `Columns (${anyRestricted} restricted)` : "Columns"
 
   const toggleColumn = async (column, permission) => {
     const visible = permission !== PERMISSION_OPTIONS.HIDDEN
@@ -28,13 +29,6 @@
     dispatch(visible ? "show-column" : "hide-column")
   }
 
-  const getText = columns => {
-    const restricted = columns.filter(
-      col => !col.visible || col.readonly
-    ).length
-    return restricted ? `Columns (${restricted} restricted)` : "Columns"
-  }
-
   const PERMISSION_OPTIONS = {
     WRITABLE: "writable",
     READONLY: "readonly",
@@ -83,7 +77,7 @@
     quiet
     size="M"
     on:click={() => (open = !open)}
-    selected={open || anyHidden}
+    selected={open || anyRestricted}
     disabled={!$columns.length}
   >
     {text}

From 9ac462c39029c33b26011051c689e8c8cb06cd07 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 31 May 2024 12:44:11 +0200
Subject: [PATCH 018/128] Remove double checks

---
 .../backend/DataTable/ViewV2DataTable.svelte       |  3 +--
 .../grid/controls/ColumnsSettingButton.svelte      | 14 +++++++-------
 .../src/components/grid/layout/Grid.svelte         |  8 ++------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 45cdeeee07..646b764a2c 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -28,8 +28,7 @@
     showAvatars={false}
     on:updatedatasource={handleGridViewUpdate}
     isCloud={$admin.cloud}
-    showReadonlyColumnsOptions
-    canSetReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
+    allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
   >
     <svelte:fragment slot="filter">
       <GridFilterButton />
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 4ed91f070f..3f0e2341be 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -4,8 +4,7 @@
   import { getColumnIcon } from "../lib/utils"
   import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
 
-  export let showReadonlyColumnsOptions = false
-  export let canSetReadonlyColumns = false
+  export let allowViewReadonlyColumns = false
 
   const { columns, datasource, stickyColumn, dispatch } = getContext("grid")
 
@@ -43,10 +42,10 @@
   $: READONLY_OPTION = {
     icon: "Visibility",
     value: PERMISSION_OPTIONS.READONLY,
-    tooltip: canSetReadonlyColumns
+    tooltip: allowViewReadonlyColumns
       ? "Read only"
       : "Read only (premium feature)",
-    disabled: !canSetReadonlyColumns,
+    disabled: !allowViewReadonlyColumns,
   }
   const HIDDEN_OPTION = {
     icon: "VisibilityOff",
@@ -54,9 +53,10 @@
     tooltip: "Hidden",
   }
 
-  $: options = showReadonlyColumnsOptions
-    ? [EDIT_OPTION, READONLY_OPTION, HIDDEN_OPTION]
-    : [EDIT_OPTION, HIDDEN_OPTION]
+  $: options =
+    $datasource.type === "viewV2"
+      ? [EDIT_OPTION, READONLY_OPTION, HIDDEN_OPTION]
+      : [EDIT_OPTION, HIDDEN_OPTION]
 
   function columnToPermissionOptions(column) {
     if (!column.visible) {
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 8d95540fa7..8a82209162 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -57,8 +57,7 @@
   export let buttons = null
   export let darkMode
   export let isCloud = null
-  export let showReadonlyColumnsOptions = false
-  export let canSetReadonlyColumns = false
+  export let allowViewReadonlyColumns = false
 
   // Unique identifier for DOM nodes inside this instance
   const gridID = `grid-${Math.random().toString().slice(2)}`
@@ -155,10 +154,7 @@
       <div class="controls-left">
         <slot name="filter" />
         <SortButton />
-        <ColumnsSettingButton
-          {showReadonlyColumnsOptions}
-          {canSetReadonlyColumns}
-        />
+        <ColumnsSettingButton {allowViewReadonlyColumns} />
         <SizeButton />
         <slot name="controls" />
       </div>

From d4d17893efa6caed0708c99090e0ca0d7a2ae379 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 31 May 2024 11:04:03 +0200
Subject: [PATCH 019/128] Respect schema readonly on client

---
 packages/client/src/components/app/forms/InnerForm.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 55c9c938c3..bb2f51fc95 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -206,7 +206,7 @@
           error: initialError,
           disabled:
             disabled || fieldDisabled || (isAutoColumn && !editAutoColumns),
-          readonly: readonly || fieldReadOnly,
+          readonly: readonly || fieldReadOnly || schema?.[field]?.readonly,
           defaultValue,
           validator,
           lastUpdate: Date.now(),

From 03a7dd2b596e1d0cceed1a07f0637c05ad49197f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 31 May 2024 14:32:26 +0100
Subject: [PATCH 020/128] Add SQS params to Helm chart.

---
 .../budibase/templates/app-service-deployment.yaml   | 12 ++++++++++++
 .../templates/worker-service-deployment.yaml         | 12 ++++++++++++
 charts/budibase/values.yaml                          |  9 +++++++++
 3 files changed, 33 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index ed7166ec5d..f399fcb8b6 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -42,6 +42,14 @@ spec:
           {{ else }}
           value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
           {{ end }}
+        {{ if .Values.globals.sqs.enabled }}
+        - name: COUCH_DB_SQL_URL
+        {{ if .Values.globals.sqs.url }}
+          value: {{ .Values.globals.sqs.url }}
+        {{ else }}
+          value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.globals.sqs.port }}
+        {{ end }}
+        {{ end }}
         {{ if .Values.services.couchdb.enabled }}
         - name: COUCH_DB_USER
           valueFrom:
@@ -198,6 +206,10 @@ spec:
         - name: APP_FEATURES
           value: "api"
         {{- end }}
+        {{- if .Values.globals.sqs.enabled }}
+        - name: SQS_SEARCH_ENABLE
+          value: "true"
+        {{- end }}
         {{- range .Values.services.apps.extraEnv }}
         - name: {{ .name }}
           value: {{ .value | quote }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 66a9bb6c14..38edfa21c0 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -56,6 +56,14 @@ spec:
           {{ else }}
           value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
           {{ end }}
+        {{ if .Values.globals.sqs.enabled }}
+        - name: COUCH_DB_SQL_URL
+        {{ if .Values.globals.sqs.url }}
+          value: {{ .Values.globals.sqs.url }}
+        {{ else }}
+          value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.globals.sqs.port }}
+        {{ end }}
+        {{ end }}
         - name: API_ENCRYPTION_KEY
           value: {{ .Values.globals.apiEncryptionKey | quote }}
         - name: HTTP_LOGGING
@@ -184,6 +192,10 @@ spec:
         - name: NODE_TLS_REJECT_UNAUTHORIZED
           value: {{ .Values.services.tlsRejectUnauthorized }}
         {{ end }}
+        {{- if .Values.globals.sqs.enabled }}
+        - name: SQS_SEARCH_ENABLE
+          value: "true"
+        {{- end }}
         {{- range .Values.services.worker.extraEnv }}
         - name: {{ .name }}
           value: {{ .value | quote }}
diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 27037cdaa8..2069a2540d 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -138,6 +138,15 @@ globals:
     # -- The password to use when authenticating with your SMTP server.
     password: ""
 
+  sqs:
+    # -- Whether to use the CouchDB "structure query service" or not. This is disabled by
+    # default for now, but will become the default in a future release.
+    enabled: false
+    # @ignore
+    url: ""
+    # @ignore
+    port: "4984"
+
 services:
   # -- The DNS suffix to use for service discovery. You only need to change this
   # if you've configured your cluster to use a different DNS suffix.

From 1777ac4b046903f2905b93a724eb39ead0e179aa Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 31 May 2024 14:59:15 +0100
Subject: [PATCH 021/128] Fix mariadb healthcheck.

---
 packages/server/src/integrations/tests/utils/mariadb.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/tests/utils/mariadb.ts b/packages/server/src/integrations/tests/utils/mariadb.ts
index fcd79b8e56..c4dd4cf43b 100644
--- a/packages/server/src/integrations/tests/utils/mariadb.ts
+++ b/packages/server/src/integrations/tests/utils/mariadb.ts
@@ -18,7 +18,7 @@ class MariaDBWaitStrategy extends AbstractWaitStrategy {
     await logs.waitUntilReady(container, boundPorts, startTime)
 
     const command = Wait.forSuccessfulCommand(
-      `mysqladmin ping -h localhost -P 3306 -u root -ppassword`
+      `/usr/local/bin/healthcheck.sh --innodb_initialized`
     )
     await command.waitUntilReady(container)
   }

From 9912904bd1faf766c4cb7c58877c95634090ad91 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 May 2024 16:07:46 +0100
Subject: [PATCH 022/128] Fixing an issue with error cases that have a
 content-disposition being downloaded as a file.

---
 packages/server/src/integrations/rest.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index 451c319aa9..86c059bc82 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@@ -149,13 +149,12 @@ class RestIntegration implements IntegrationBase {
       { downloadImages: this.config.downloadImages }
     )
     let contentLength = response.headers.get("content-length")
-    if (!contentLength && raw) {
-      contentLength = Buffer.byteLength(raw, "utf8").toString()
-    }
+    let isSuccess = response.status >= 200 && response.status < 300
     if (
-      contentDisposition.includes("filename") ||
-      contentDisposition.includes("attachment") ||
-      contentDisposition.includes("form-data")
+      (contentDisposition.includes("filename") ||
+        contentDisposition.includes("attachment") ||
+        contentDisposition.includes("form-data")) &&
+      isSuccess
     ) {
       filename =
         path.basename(parse(contentDisposition).parameters?.filename) || ""
@@ -168,6 +167,9 @@ class RestIntegration implements IntegrationBase {
         return handleFileResponse(response, filename, this.startTimeMs)
       } else {
         responseTxt = response.text ? await response.text() : ""
+        if (!contentLength && responseTxt) {
+          contentLength = Buffer.byteLength(responseTxt, "utf8").toString()
+        }
         const hasContent =
           (contentLength && parseInt(contentLength) > 0) ||
           responseTxt.length > 0

From 4a1f24d0d8925979a4d6d6322ba34909f7431ffe Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 May 2024 16:08:10 +0100
Subject: [PATCH 023/128] Fixing an issue with default parameters not being
 passed into dynamic parameters.

---
 packages/server/src/threads/query.ts | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index 54322b1156..1210461bba 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -14,7 +14,13 @@ import { context, cache, auth } from "@budibase/backend-core"
 import { getGlobalIDFromUserMetadataID } from "../db/utils"
 import sdk from "../sdk"
 import { cloneDeep } from "lodash/fp"
-import { Datasource, Query, SourceName, Row } from "@budibase/types"
+import {
+  Datasource,
+  Query,
+  SourceName,
+  Row,
+  QueryParameter,
+} from "@budibase/types"
 
 import { isSQL } from "../integrations/utils"
 import { interpolateSQL } from "../integrations/queries/sql"
@@ -196,12 +202,22 @@ class QueryRunner {
     return { rows, keys, info, extra, pagination }
   }
 
-  async runAnotherQuery(queryId: string, parameters: any) {
+  async runAnotherQuery(
+    queryId: string,
+    currentParameters: Record<string, any>
+  ) {
     const db = context.getAppDB()
     const query = await db.get<Query>(queryId)
     const datasource = await sdk.datasources.get(query.datasourceId, {
       enriched: true,
     })
+    // enrich parameters with dynamic queries defaults
+    const defaultParams = query.parameters || []
+    for (let param of defaultParams) {
+      if (!currentParameters[param.name]) {
+        currentParameters[param.name] = param.default
+      }
+    }
     return new QueryRunner(
       {
         schema: query.schema,
@@ -210,7 +226,7 @@ class QueryRunner {
         transformer: query.transformer,
         nullDefaultSupport: query.nullDefaultSupport,
         ctx: this.ctx,
-        parameters,
+        parameters: currentParameters,
         datasource,
         queryId,
       },

From 6df5315b32b660414dbd0150fe728714a83d1342 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 May 2024 16:08:33 +0100
Subject: [PATCH 024/128] Update yarn lock

---
 yarn.lock | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 677b7cb441..d85a50e938 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11904,6 +11904,17 @@ glob@^10.0.0, glob@^10.2.2:
     minipass "^7.0.4"
     path-scurry "^1.10.2"
 
+glob@^10.3.7:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
+
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -13472,6 +13483,15 @@ jackspeak@^2.3.6:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab"
+  integrity sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -15751,6 +15771,13 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -15845,6 +15872,11 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
   integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
+minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -16033,10 +16065,10 @@ mute-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
   integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
 
-mysql2@3.9.7:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.9.7.tgz#843755daf65b5ef08afe545fe14b8fb62824741a"
-  integrity sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==
+mysql2@3.9.8:
+  version "3.9.8"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.9.8.tgz#fe8a0f975f2c495ed76ca988ddc5505801dc49ce"
+  integrity sha512-+5JKNjPuks1FNMoy9TYpl77f+5frbTklz7eb3XDwbpsERRLEeXiW2PDEkakYF50UuKU2qwfGnyXpKYvukv8mGA==
   dependencies:
     denque "^2.1.0"
     generate-function "^2.3.1"
@@ -17378,6 +17410,14 @@ path-scurry@^1.10.2, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@1.x:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
@@ -19318,6 +19358,13 @@ rimraf@^4.4.1:
   dependencies:
     glob "^9.2.0"
 
+rimraf@^5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74"
+  integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==
+  dependencies:
+    glob "^10.3.7"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"

From 75501c225198a43ffceae4f8eb8df44faf9c2532 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 May 2024 17:57:31 +0100
Subject: [PATCH 025/128] Updating object store stream upload to make sure the
 stream has finished being processed before trying to upload to AWS (and only
 uploading a partial stream).

---
 .../src/objectStore/objectStore.ts            | 35 +++++++++++++++----
 .../types/src/documents/app/automation.ts     |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 0ac2c35179..35748d8f76 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -41,10 +41,7 @@ type UploadParams = BaseUploadParams & {
   path?: string | PathLike
 }
 
-export type StreamTypes =
-  | ReadStream
-  | NodeJS.ReadableStream
-  | ReadableStream<Uint8Array>
+export type StreamTypes = ReadStream | NodeJS.ReadableStream
 
 export type StreamUploadParams = BaseUploadParams & {
   stream?: StreamTypes
@@ -222,6 +219,9 @@ export async function streamUpload({
   extra,
   ttl,
 }: StreamUploadParams) {
+  if (!stream) {
+    throw new Error("Stream to upload is invalid/undefined")
+  }
   const extension = filename.split(".").pop()
   const objectStore = ObjectStore(bucketName)
   const bucketCreated = await createBucketIfNotExists(objectStore, bucketName)
@@ -251,14 +251,35 @@ export async function streamUpload({
       : CONTENT_TYPE_MAP.txt
   }
 
+  const bucket = sanitizeBucket(bucketName),
+    objKey = sanitizeKey(filename)
   const params = {
-    Bucket: sanitizeBucket(bucketName),
-    Key: sanitizeKey(filename),
+    Bucket: bucket,
+    Key: objKey,
     Body: stream,
     ContentType: contentType,
     ...extra,
   }
-  return objectStore.upload(params).promise()
+
+  // make sure we have the stream before we try to push it to object store
+  if (stream.on) {
+    await new Promise((resolve, reject) => {
+      stream.on("finish", resolve)
+      stream.on("error", reject)
+    })
+  }
+
+  const details = await objectStore.upload(params).promise()
+  const headDetails = await objectStore
+    .headObject({
+      Bucket: bucket,
+      Key: objKey,
+    })
+    .promise()
+  return {
+    ...details,
+    ContentLength: headDetails.ContentLength,
+  }
 }
 
 /**
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index 6d1753dc28..63291fa3bb 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -245,7 +245,7 @@ export type AutomationAttachment = {
 
 export type AutomationAttachmentContent = {
   filename: string
-  content: ReadStream | NodeJS.ReadableStream | ReadableStream<Uint8Array>
+  content: ReadStream | NodeJS.ReadableStream
 }
 
 export type BucketedContent = AutomationAttachmentContent & {

From d90763dd3c88008454a0cbe0a51175cfa454af0d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 May 2024 17:59:16 +0100
Subject: [PATCH 026/128] Getting size parameter right for streams.

---
 packages/server/src/integrations/utils/utils.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts
index 9f04457d7a..be689fbfd3 100644
--- a/packages/server/src/integrations/utils/utils.ts
+++ b/packages/server/src/integrations/utils/utils.ts
@@ -368,13 +368,16 @@ export async function handleFileResponse(
       size = parseInt(contentLength, 10)
     }
 
-    await objectStore.streamUpload({
+    const details = await objectStore.streamUpload({
       bucket,
       filename: key,
       stream,
       ttl: 1,
       type: response.headers["content-type"],
     })
+    if (!size && details.ContentLength) {
+      size = details.ContentLength
+    }
   }
   presignedUrl = objectStore.getPresignedUrl(bucket, key)
   return {

From 26a0801b755ff704c62d6a7ac1755e8bd8b8ad5a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 3 Jun 2024 10:15:16 +0100
Subject: [PATCH 027/128] Linting.

---
 packages/server/src/threads/query.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index 1210461bba..d76714661d 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -19,7 +19,6 @@ import {
   Query,
   SourceName,
   Row,
-  QueryParameter,
 } from "@budibase/types"
 
 import { isSQL } from "../integrations/utils"

From 5912c2b129f9888268a95afa23514668dcb97d43 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 31 May 2024 13:30:05 +0200
Subject: [PATCH 028/128] Copy change

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 3 +--
 packages/server/src/sdk/app/views/index.ts          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 962d6e82a3..7e02966b44 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -349,8 +349,7 @@ describe.each([
         await config.api.viewV2.create(newView, {
           status: 400,
           body: {
-            message:
-              'Field "name" cannot be readonly as it is a required field',
+            message: 'You can\'t make the required field "name" read only',
             status: 400,
           },
         })
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 18ab94be21..150fe2c678 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -60,7 +60,7 @@ async function guardViewSchema(
 
       if (isRequired(tableSchemaField.constraints)) {
         throw new HTTPError(
-          `Field "${field}" cannot be readonly as it is a required field`,
+          `You can't make the required field "${field}" read only`,
           400
         )
       }

From efc9d3399e11c20daf744e30194bcc7aac79e195 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 31 May 2024 17:08:50 +0200
Subject: [PATCH 029/128] Validate schema

---
 .../src/api/routes/tests/viewV2.spec.ts       | 126 +++++++++++++++++-
 .../server/src/api/routes/utils/validators.ts |  36 ++++-
 2 files changed, 153 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 7e02966b44..af5cbfc063 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -23,9 +23,6 @@ import { DatabaseName, getDatasource } from "../../../integrations/tests/utils"
 import merge from "lodash/merge"
 import { quotas } from "@budibase/pro"
 import { roles } from "@budibase/backend-core"
-import * as schemaUtils from "../../../utilities/schema"
-
-jest.mock("../../../utilities/schema")
 
 describe.each([
   ["internal", undefined],
@@ -318,15 +315,13 @@ describe.each([
       })
 
       it("required fields cannot be marked as readonly", async () => {
-        const isRequiredSpy = jest.spyOn(schemaUtils, "isRequired")
-        isRequiredSpy.mockReturnValueOnce(true)
-
         const table = await config.api.table.save(
           saveTableRequest({
             schema: {
               name: {
                 name: "name",
                 type: FieldType.STRING,
+                constraints: { presence: true },
               },
               description: {
                 name: "description",
@@ -1347,4 +1342,123 @@ describe.each([
       })
     })
   })
+
+  describe("updating table schema", () => {
+    describe("existing columns changed to required", () => {
+      beforeEach(async () => {
+        table = await config.api.table.save(
+          saveTableRequest({
+            schema: {
+              id: {
+                name: "id",
+                type: FieldType.AUTO,
+                autocolumn: true,
+              },
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+              },
+            },
+          })
+        )
+      })
+
+      it("allows updating when no views constrains the field", async () => {
+        await config.api.viewV2.create({
+          name: "view a",
+          tableId: table._id!,
+          schema: {
+            id: { visible: true },
+            name: { visible: true },
+          },
+        })
+
+        table = await config.api.table.get(table._id!)
+        await config.api.table.save(
+          {
+            ...table,
+            schema: {
+              ...table.schema,
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+                constraints: { presence: { allowEmpty: false } },
+              },
+            },
+          },
+          { status: 200 }
+        )
+      })
+
+      it("rejects if field is readonly in any view", async () => {
+        mocks.licenses.useViewReadonlyColumns()
+
+        await config.api.viewV2.create({
+          name: "view a",
+          tableId: table._id!,
+          schema: {
+            id: { visible: true },
+            name: {
+              visible: true,
+              readonly: true,
+            },
+          },
+        })
+
+        table = await config.api.table.get(table._id!)
+        await config.api.table.save(
+          {
+            ...table,
+            schema: {
+              ...table.schema,
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+                constraints: { presence: true },
+              },
+            },
+          },
+          {
+            status: 400,
+            body: {
+              status: 400,
+              message:
+                'Invalid body - Required field "name" is missing in view "view a"',
+            },
+          }
+        )
+      })
+
+      it("rejects if field is hidden in any view", async () => {
+        await config.api.viewV2.create({
+          name: "view a",
+          tableId: table._id!,
+          schema: { id: { visible: true } },
+        })
+
+        table = await config.api.table.get(table._id!)
+        await config.api.table.save(
+          {
+            ...table,
+            schema: {
+              ...table.schema,
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+                constraints: { presence: true },
+              },
+            },
+          },
+          {
+            status: 400,
+            body: {
+              status: 400,
+              message:
+                'Invalid body - Required field "name" is missing in view "view a"',
+            },
+          }
+        )
+      })
+    })
+  })
 })
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index 424d0d6c79..0a4eff4247 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -1,14 +1,44 @@
 import { auth, permissions } from "@budibase/backend-core"
 import { DataSourceOperation } from "../../../constants"
-import { WebhookActionType } from "@budibase/types"
-import Joi from "joi"
+import { Table, WebhookActionType } from "@budibase/types"
+import Joi, { CustomValidator } from "joi"
 import { ValidSnippetNameRegex } from "@budibase/shared-core"
+import { isRequired } from "../../../utilities/schema"
+import sdk from "../../../sdk"
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)
 const APP_NAME_REGEX = /^[\w\s]+$/
 
+const validateViewSchemas: CustomValidator<Table> = (table, helpers) => {
+  if (table.views && Object.entries(table.views).length) {
+    const requiredFields = Object.entries(table.schema)
+      .filter(([_, v]) => isRequired(v.constraints))
+      .map(([key]) => key)
+    if (requiredFields.length) {
+      for (const view of Object.values(table.views)) {
+        if (!sdk.views.isV2(view)) {
+          continue
+        }
+
+        const editableViewFields = Object.entries(view.schema || {})
+          .filter(([_, f]) => f.visible && !f.readonly)
+          .map(([key]) => key)
+        const missingField = requiredFields.find(
+          f => !editableViewFields.includes(f)
+        )
+        if (missingField) {
+          return helpers.message({
+            custom: `Required field "${missingField}" is missing in view "${view.name}"`,
+          })
+        }
+      }
+    }
+  }
+  return table
+}
+
 export function tableValidator() {
   // prettier-ignore
   return auth.joiValidator.body(Joi.object({
@@ -20,7 +50,7 @@ export function tableValidator() {
     name: Joi.string().required(),
     views: Joi.object(),
     rows: Joi.array(),
-  }).unknown(true))
+  }).custom(validateViewSchemas).unknown(true))
 }
 
 export function nameValidator() {

From 326a90a41e550b9859933fc7531b547efd06c622 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 14:37:19 +0200
Subject: [PATCH 030/128] Allow modifying views with readonly configs (other
 fields)

---
 packages/server/src/sdk/app/views/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 150fe2c678..292d643648 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -54,7 +54,10 @@ async function guardViewSchema(
     }
 
     if (viewSchema[field].readonly) {
-      if (!(await features.isViewReadonlyColumnsEnabled())) {
+      if (
+        !(await features.isViewReadonlyColumnsEnabled()) &&
+        !(tableSchemaField as ViewUIFieldMetadata).readonly
+      ) {
         throw new HTTPError(`Readonly fields are not enabled`, 400)
       }
 

From dad689c78700c1344abffbf01276889d6a6deb46 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 30 May 2024 14:37:35 +0200
Subject: [PATCH 031/128] Reset schema mutations on erroring

---
 .../src/components/grid/controls/ColumnsSettingButton.svelte | 2 ++
 .../frontend-core/src/components/grid/stores/datasource.js   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 3f0e2341be..aa27871f92 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -24,6 +24,8 @@
       await datasource.actions.saveSchemaMutations()
     } catch (e) {
       notifications.error(e.message)
+    } finally {
+      datasource.actions.resetSchemaMutations()
     }
     dispatch(visible ? "show-column" : "hide-column")
   }
diff --git a/packages/frontend-core/src/components/grid/stores/datasource.js b/packages/frontend-core/src/components/grid/stores/datasource.js
index 1fc973f171..09b8be4868 100644
--- a/packages/frontend-core/src/components/grid/stores/datasource.js
+++ b/packages/frontend-core/src/components/grid/stores/datasource.js
@@ -204,6 +204,10 @@ export const createActions = context => {
       ...$definition,
       schema: newSchema,
     })
+    resetSchemaMutations()
+  }
+
+  const resetSchemaMutations = () => {
     schemaMutations.set({})
   }
 
@@ -253,6 +257,7 @@ export const createActions = context => {
         addSchemaMutation,
         addSchemaMutations,
         saveSchemaMutations,
+        resetSchemaMutations,
       },
     },
   }

From d73d7113aedd31a4674ca4560080f34b98d67f5f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 10:07:42 +0200
Subject: [PATCH 032/128] Refresh on error

---
 .../components/grid/controls/ColumnsSettingButton.svelte  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index aa27871f92..228cf69e34 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -19,13 +19,17 @@
     const visible = permission !== PERMISSION_OPTIONS.HIDDEN
     const readonly = permission === PERMISSION_OPTIONS.READONLY
 
-    datasource.actions.addSchemaMutation(column.name, { visible, readonly })
+    await datasource.actions.addSchemaMutation(column.name, {
+      visible,
+      readonly,
+    })
     try {
       await datasource.actions.saveSchemaMutations()
     } catch (e) {
       notifications.error(e.message)
     } finally {
-      datasource.actions.resetSchemaMutations()
+      await datasource.actions.resetSchemaMutations()
+      await datasource.actions.refreshDefinition()
     }
     dispatch(visible ? "show-column" : "hide-column")
   }

From 91c20213dc20341d1cee5dacc27b7a957ffadc37 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 10:29:26 +0200
Subject: [PATCH 033/128] Validate readonly

---
 .../src/api/routes/tests/viewV2.spec.ts       |  3 ++-
 packages/server/src/sdk/app/views/index.ts    | 25 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index af5cbfc063..4e98ffe3cc 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -336,6 +336,7 @@ describe.each([
           tableId: table._id!,
           schema: {
             name: {
+              visible: true,
               readonly: true,
             },
           },
@@ -344,7 +345,7 @@ describe.each([
         await config.api.viewV2.create(newView, {
           status: 400,
           body: {
-            message: 'You can\'t make the required field "name" read only',
+            message: 'You can\'t make read only the required field "name"',
             status: 400,
           },
         })
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 292d643648..ff51a73e99 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -39,9 +39,7 @@ async function guardViewSchema(
   tableId: string,
   viewSchema?: Record<string, ViewUIFieldMetadata>
 ) {
-  if (!viewSchema || !Object.keys(viewSchema).length) {
-    return
-  }
+  viewSchema ??= {}
   const table = await sdk.tables.getTable(tableId)
 
   for (const field of Object.keys(viewSchema)) {
@@ -61,13 +59,6 @@ async function guardViewSchema(
         throw new HTTPError(`Readonly fields are not enabled`, 400)
       }
 
-      if (isRequired(tableSchemaField.constraints)) {
-        throw new HTTPError(
-          `You can't make the required field "${field}" read only`,
-          400
-        )
-      }
-
       if (!viewSchema[field].visible) {
         throw new HTTPError(
           `Field "${field}" must be visible if you want to make it readonly`,
@@ -76,6 +67,20 @@ async function guardViewSchema(
       }
     }
   }
+
+  for (const field of Object.values(table.schema)) {
+    if (!isRequired(field.constraints)) {
+      continue
+    }
+
+    const viewSchemaField = viewSchema[field.name]
+    if (viewSchemaField?.readonly) {
+      throw new HTTPError(
+        `You can't make read only the required field "${field.name}"`,
+        400
+      )
+    }
+  }
 }
 
 export async function create(

From c1b760ca9e1c977396fa0fd201c7b09ab0b0ba39 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 12:43:51 +0200
Subject: [PATCH 034/128] Validate that required fields can't be hidden in
 views

---
 packages/server/src/sdk/app/views/index.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index ff51a73e99..98871539c2 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -74,7 +74,15 @@ async function guardViewSchema(
     }
 
     const viewSchemaField = viewSchema[field.name]
-    if (viewSchemaField?.readonly) {
+
+    if (!viewSchemaField?.visible) {
+      throw new HTTPError(
+        `You can't hide the required field "${field.name}"`,
+        400
+      )
+    }
+
+    if (viewSchemaField.readonly) {
       throw new HTTPError(
         `You can't make read only the required field "${field.name}"`,
         400

From 155de99b68c8fc481cc4d0ac37eba751595cb22f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 3 Jun 2024 11:46:20 +0100
Subject: [PATCH 035/128] Streaming to disk before passing onto S3.

---
 .../src/objectStore/objectStore.ts            |  9 +--
 packages/server/package.json                  |  5 +-
 .../src/integrations/tests/rest.spec.ts       |  2 +
 .../server/src/integrations/utils/utils.ts    | 70 +++++++++++--------
 yarn.lock                                     | 12 +++-
 5 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 35748d8f76..de94e3968b 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -14,6 +14,7 @@ import { v4 } from "uuid"
 import { APP_PREFIX, APP_DEV_PREFIX } from "../db"
 import fsp from "fs/promises"
 import { HeadObjectOutput } from "aws-sdk/clients/s3"
+import { ReadableStream } from "stream/web"
 
 const streamPipeline = promisify(stream.pipeline)
 // use this as a temporary store of buckets that are being created
@@ -261,14 +262,6 @@ export async function streamUpload({
     ...extra,
   }
 
-  // make sure we have the stream before we try to push it to object store
-  if (stream.on) {
-    await new Promise((resolve, reject) => {
-      stream.on("finish", resolve)
-      stream.on("error", reject)
-    })
-  }
-
   const details = await objectStore.upload(params).promise()
   const headDetails = await objectStore
     .headObject({
diff --git a/packages/server/package.json b/packages/server/package.json
index bd5a82cb29..b3beac7ffb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -68,7 +68,6 @@
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
-    "bl": "^6.0.12",
     "bull": "4.10.1",
     "chokidar": "3.5.3",
     "content-disposition": "^0.5.4",
@@ -116,7 +115,8 @@
     "uuid": "^8.3.2",
     "validate.js": "0.13.1",
     "worker-farm": "1.7.0",
-    "xml2js": "0.5.0"
+    "xml2js": "0.5.0",
+    "tmp": "0.2.3"
   },
   "devDependencies": {
     "@babel/preset-env": "7.16.11",
@@ -137,6 +137,7 @@
     "@types/supertest": "2.0.14",
     "@types/tar": "6.1.5",
     "@types/uuid": "8.3.4",
+    "@types/tmp": "0.2.6",
     "copyfiles": "2.4.1",
     "docker-compose": "0.23.17",
     "jest": "29.7.0",
diff --git a/packages/server/src/integrations/tests/rest.spec.ts b/packages/server/src/integrations/tests/rest.spec.ts
index f20f369c25..dee17a5497 100644
--- a/packages/server/src/integrations/tests/rest.spec.ts
+++ b/packages/server/src/integrations/tests/rest.spec.ts
@@ -657,6 +657,7 @@ describe("REST Integration", () => {
       mockReadable.push(null)
       ;(fetch as unknown as jest.Mock).mockImplementationOnce(() =>
         Promise.resolve({
+          status: 200,
           headers: {
             raw: () => ({
               "content-type": [contentType],
@@ -700,6 +701,7 @@ describe("REST Integration", () => {
       mockReadable.push(null)
       ;(fetch as unknown as jest.Mock).mockImplementationOnce(() =>
         Promise.resolve({
+          status: 200,
           headers: {
             raw: () => ({
               "content-type": [contentType],
diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts
index be689fbfd3..157bdba3bd 100644
--- a/packages/server/src/integrations/utils/utils.ts
+++ b/packages/server/src/integrations/utils/utils.ts
@@ -9,10 +9,12 @@ import { context, objectStore, sql } from "@budibase/backend-core"
 import { v4 } from "uuid"
 import { parseStringPromise as xmlParser } from "xml2js"
 import { formatBytes } from "../../utilities"
-import bl from "bl"
 import env from "../../environment"
 import { InvalidColumns } from "../../constants"
 import { helpers, utils } from "@budibase/shared-core"
+import { pipeline } from "stream/promises"
+import tmp from "tmp"
+import fs from "fs"
 
 type PrimitiveTypes =
   | FieldType.STRING
@@ -360,38 +362,44 @@ export async function handleFileResponse(
   const key = `${context.getProdAppId()}/${processedFileName}`
   const bucket = objectStore.ObjectStoreBuckets.TEMP
 
-  const stream = response.body.pipe(bl((error, data) => data))
+  // put the response stream to disk temporarily as a buffer
+  const tmpObj = tmp.fileSync()
+  try {
+    await pipeline(response.body, fs.createWriteStream(tmpObj.name))
+    if (response.body) {
+      const contentLength = response.headers.get("content-length")
+      if (contentLength) {
+        size = parseInt(contentLength, 10)
+      }
 
-  if (response.body) {
-    const contentLength = response.headers.get("content-length")
-    if (contentLength) {
-      size = parseInt(contentLength, 10)
+      const details = await objectStore.streamUpload({
+        bucket,
+        filename: key,
+        stream: fs.createReadStream(tmpObj.name),
+        ttl: 1,
+        type: response.headers["content-type"],
+      })
+      if (!size && details.ContentLength) {
+        size = details.ContentLength
+      }
     }
-
-    const details = await objectStore.streamUpload({
-      bucket,
-      filename: key,
-      stream,
-      ttl: 1,
-      type: response.headers["content-type"],
-    })
-    if (!size && details.ContentLength) {
-      size = details.ContentLength
+    presignedUrl = objectStore.getPresignedUrl(bucket, key)
+    return {
+      data: {
+        size,
+        name: processedFileName,
+        url: presignedUrl,
+        extension: fileExtension,
+        key: key,
+      },
+      info: {
+        code: response.status,
+        size: formatBytes(size.toString()),
+        time: `${Math.round(performance.now() - startTime)}ms`,
+      },
     }
-  }
-  presignedUrl = objectStore.getPresignedUrl(bucket, key)
-  return {
-    data: {
-      size,
-      name: processedFileName,
-      url: presignedUrl,
-      extension: fileExtension,
-      key: key,
-    },
-    info: {
-      code: response.status,
-      size: formatBytes(size.toString()),
-      time: `${Math.round(performance.now() - startTime)}ms`,
-    },
+  } finally {
+    // cleanup tmp
+    tmpObj.removeCallback()
   }
 }
diff --git a/yarn.lock b/yarn.lock
index d85a50e938..5297fe0cad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6348,6 +6348,11 @@
   dependencies:
     "@types/estree" "*"
 
+"@types/tmp@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
+  integrity sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==
+
 "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -7700,7 +7705,7 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bl@^6.0.12, bl@^6.0.3:
+bl@^6.0.3:
   version "6.0.12"
   resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.12.tgz#77c35b96e13aeff028496c798b75389ddee9c7f8"
   integrity sha512-EnEYHilP93oaOa2MnmNEjAcovPS3JlQZOyzGXi3EyEpPhm9qWvdDp7BmAVEVusGzp8LlwQK56Av+OkDoRjzE0w==
@@ -21283,6 +21288,11 @@ tlhunter-sorted-set@^0.1.0:
   resolved "https://registry.yarnpkg.com/tlhunter-sorted-set/-/tlhunter-sorted-set-0.1.0.tgz#1c3eae28c0fa4dff97e9501d2e3c204b86406f4b"
   integrity sha512-eGYW4bjf1DtrHzUYxYfAcSytpOkA44zsr7G2n3PV7yOUR23vmkGe3LL4R+1jL9OsXtbsFOwe8XtbCrabeaEFnw==
 
+tmp@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"

From 38ff7debb46dc32f8d7f1b8d3ce073d5ad893594 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 3 Jun 2024 12:08:54 +0100
Subject: [PATCH 036/128] Linting.

---
 packages/server/src/threads/query.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index d76714661d..ba451a3325 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -14,12 +14,7 @@ import { context, cache, auth } from "@budibase/backend-core"
 import { getGlobalIDFromUserMetadataID } from "../db/utils"
 import sdk from "../sdk"
 import { cloneDeep } from "lodash/fp"
-import {
-  Datasource,
-  Query,
-  SourceName,
-  Row,
-} from "@budibase/types"
+import { Datasource, Query, SourceName, Row } from "@budibase/types"
 
 import { isSQL } from "../integrations/utils"
 import { interpolateSQL } from "../integrations/queries/sql"

From cc3808997cb3938df99e793c13aad2935ef4e446 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 13:26:49 +0200
Subject: [PATCH 037/128] Fix viewV2 tests

---
 .../src/api/routes/tests/viewV2.spec.ts       | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 4e98ffe3cc..57a26dd6c7 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -117,6 +117,9 @@ describe.each([
       const newView: CreateViewRequest = {
         name: generator.name(),
         tableId: table._id!,
+        schema: {
+          id: { visible: true },
+        },
       }
       const res = await config.api.viewV2.create(newView)
 
@@ -145,6 +148,7 @@ describe.each([
           type: SortType.STRING,
         },
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
           },
@@ -155,6 +159,7 @@ describe.each([
       expect(res).toEqual({
         ...newView,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
           },
@@ -169,6 +174,11 @@ describe.each([
         name: generator.name(),
         tableId: table._id!,
         schema: {
+          id: {
+            name: "id",
+            type: FieldType.NUMBER,
+            visible: true,
+          },
           Price: {
             name: "Price",
             type: FieldType.NUMBER,
@@ -190,6 +200,7 @@ describe.each([
       expect(createdView).toEqual({
         ...newView,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
             order: 1,
@@ -206,6 +217,12 @@ describe.each([
         name: generator.name(),
         tableId: table._id!,
         schema: {
+          id: {
+            name: "id",
+            type: FieldType.AUTO,
+            autocolumn: true,
+            visible: true,
+          },
           Price: {
             name: "Price",
             type: FieldType.NUMBER,
@@ -229,6 +246,7 @@ describe.each([
         tableId: table._id!,
         primaryDisplay: generator.word(),
         schema: {
+          id: { visible: true },
           Price: { visible: true },
           Category: { visible: false },
         },
@@ -238,6 +256,7 @@ describe.each([
       expect(res).toEqual({
         ...newView,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
           },
@@ -252,6 +271,7 @@ describe.each([
         name: generator.name(),
         tableId: table._id!,
         schema: {
+          id: { visible: true },
           nonExisting: {
             visible: true,
           },
@@ -290,6 +310,7 @@ describe.each([
           name: generator.name(),
           tableId: table._id!,
           schema: {
+            id: { visible: true },
             name: {
               visible: true,
               readonly: true,
@@ -303,6 +324,7 @@ describe.each([
 
         const res = await config.api.viewV2.create(newView)
         expect(res.schema).toEqual({
+          id: { visible: true },
           name: {
             visible: true,
             readonly: true,
@@ -335,6 +357,7 @@ describe.each([
           name: generator.name(),
           tableId: table._id!,
           schema: {
+            id: { visible: true },
             name: {
               visible: true,
               readonly: true,
@@ -371,6 +394,7 @@ describe.each([
           name: generator.name(),
           tableId: table._id!,
           schema: {
+            id: { visible: true },
             name: {
               visible: false,
               readonly: true,
@@ -409,6 +433,7 @@ describe.each([
           name: generator.name(),
           tableId: table._id!,
           schema: {
+            id: { visible: true },
             name: {
               visible: true,
               readonly: true,
@@ -436,6 +461,9 @@ describe.each([
       view = await config.api.viewV2.create({
         tableId: table._id!,
         name: generator.guid(),
+        schema: {
+          id: { visible: true },
+        },
       })
     })
 
@@ -484,6 +512,7 @@ describe.each([
           type: SortType.STRING,
         },
         schema: {
+          id: { visible: true },
           Category: {
             visible: false,
           },
@@ -501,7 +530,7 @@ describe.each([
           schema: {
             ...table.schema,
             id: expect.objectContaining({
-              visible: false,
+              visible: true,
             }),
             Category: expect.objectContaining({
               visible: false,
@@ -598,6 +627,9 @@ describe.each([
       const anotherView = await config.api.viewV2.create({
         tableId: table._id!,
         name: generator.guid(),
+        schema: {
+          id: { visible: true },
+        },
       })
       const result = await config
         .request!.put(`/api/v2/views/${anotherView.id}`)
@@ -616,6 +648,7 @@ describe.each([
       const updatedView = await config.api.viewV2.update({
         ...view,
         schema: {
+          ...view.schema,
           Price: {
             name: "Price",
             type: FieldType.NUMBER,
@@ -635,6 +668,7 @@ describe.each([
       expect(updatedView).toEqual({
         ...view,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
             order: 1,
@@ -651,6 +685,7 @@ describe.each([
         {
           ...view,
           schema: {
+            ...view.schema,
             Price: {
               name: "Price",
               type: FieldType.NUMBER,
@@ -674,6 +709,7 @@ describe.each([
       view = await config.api.viewV2.update({
         ...view,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
             readonly: true,
@@ -696,6 +732,7 @@ describe.each([
       view = await config.api.viewV2.update({
         ...view,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
             readonly: true,
@@ -710,6 +747,7 @@ describe.each([
       const res = await config.api.viewV2.update({
         ...view,
         schema: {
+          id: { visible: true },
           Price: {
             visible: true,
             readonly: false,
@@ -720,6 +758,7 @@ describe.each([
         expect.objectContaining({
           ...view,
           schema: {
+            id: { visible: true },
             Price: {
               visible: true,
               readonly: false,
@@ -737,6 +776,9 @@ describe.each([
       view = await config.api.viewV2.create({
         tableId: table._id!,
         name: generator.guid(),
+        schema: {
+          id: { visible: true },
+        },
       })
     })
 
@@ -759,6 +801,7 @@ describe.each([
         name: generator.name(),
         tableId: table._id!,
         schema: {
+          id: { visible: true },
           Price: { visible: false },
           Category: { visible: true },
         },
@@ -781,6 +824,7 @@ describe.each([
         name: generator.name(),
         tableId: table._id!,
         schema: {
+          id: { visible: true },
           Price: { visible: true, readonly: true },
         },
       })
@@ -816,6 +860,7 @@ describe.each([
         tableId: table._id!,
         name: generator.guid(),
         schema: {
+          id: { visible: true },
           Country: {
             visible: true,
           },
@@ -850,6 +895,7 @@ describe.each([
         tableId: table._id!,
         name: generator.guid(),
         schema: {
+          id: { visible: true },
           two: { visible: true },
         },
       })
@@ -875,6 +921,7 @@ describe.each([
           tableId: table._id!,
           name: generator.guid(),
           schema: {
+            id: { visible: true },
             one: { visible: true, readonly: true },
             two: { visible: true },
           },
@@ -916,6 +963,7 @@ describe.each([
           tableId: table._id!,
           name: generator.guid(),
           schema: {
+            id: { visible: true },
             one: { visible: true, readonly: true },
             two: { visible: true },
           },
@@ -983,6 +1031,7 @@ describe.each([
             rows.map(r => ({
               _viewId: view.id,
               tableId: table._id,
+              id: r.id,
               _id: r._id,
               _rev: r._rev,
               ...(isInternal
@@ -1023,6 +1072,7 @@ describe.each([
             },
           ],
           schema: {
+            id: { visible: true },
             two: { visible: true },
           },
         })
@@ -1034,6 +1084,7 @@ describe.each([
             {
               _viewId: view.id,
               tableId: table._id,
+              id: two.id,
               two: two.two,
               _id: two._id,
               _rev: two._rev,
@@ -1187,7 +1238,11 @@ describe.each([
 
       describe("sorting", () => {
         let table: Table
-        const viewSchema = { age: { visible: true }, name: { visible: true } }
+        const viewSchema = {
+          id: { visible: true },
+          age: { visible: true },
+          name: { visible: true },
+        }
 
         beforeAll(async () => {
           table = await config.api.table.save(

From 64a5accffd13661464197e07bb234eb1631326f7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 3 Jun 2024 13:02:24 +0000
Subject: [PATCH 038/128] Bump version to 2.27.6

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 335df975af..d90f7732a2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.27.5",
+  "version": "2.27.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 3909bbcfc00cda2173ef10eff463f7e78a67ad83 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 3 Jun 2024 15:05:18 +0100
Subject: [PATCH 039/128] NGINX headers for security audit

---
 hosting/proxy/nginx.prod.conf | 1 +
 packages/account-portal       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 79007da311..217106b1bf 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -74,6 +74,7 @@ http {
     add_header X-Content-Type-Options nosniff always;
     add_header X-XSS-Protection "1; mode=block" always;
     add_header Content-Security-Policy "${csp_default}; ${csp_script}; ${csp_style}; ${csp_object}; ${csp_base_uri}; ${csp_connect}; ${csp_font}; ${csp_frame}; ${csp_img}; ${csp_manifest}; ${csp_media}; ${csp_worker};" always;
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 
     # upstreams
     set $apps ${APPS_UPSTREAM_URL};
diff --git a/packages/account-portal b/packages/account-portal
index c167c331ff..2a5022fb94 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit c167c331ff9b8161fc18e2ecbaaf1ea5815ba964
+Subproject commit 2a5022fb946481c9f7a9c38d1413922729972be0

From 020477f1f69abf9e0c265e4f452cfbf382b35e5f Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Mon, 3 Jun 2024 17:15:51 +0300
Subject: [PATCH 040/128] qa-arc-runner-set -> ubuntu-latest

---
 .github/workflows/force-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml
index 8a9d444f51..3d96d51484 100644
--- a/.github/workflows/force-release.yml
+++ b/.github/workflows/force-release.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   ensure-is-master-tag:
     name: Ensure is a master tag
-    runs-on: qa-arc-runner-set
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout monorepo
         uses: actions/checkout@v4

From b937d95de2a4556fa10deb11a7311b7bd44f0318 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 16:55:02 +0200
Subject: [PATCH 041/128] Move isRequired to shared-core

---
 packages/server/src/sdk/app/views/index.ts             |  4 ++--
 packages/server/src/utilities/schema.ts                | 10 ----------
 packages/shared-core/src/helpers/schema.ts             | 10 ++++++++++
 .../src/helpers}/tests/schema.spec.ts                  |  0
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/{server/src/utilities => shared-core/src/helpers}/tests/schema.spec.ts (100%)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 18ab94be21..127c955dc8 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -8,6 +8,7 @@ import {
 } from "@budibase/types"
 import { HTTPError, db as dbCore } from "@budibase/backend-core"
 import { features } from "@budibase/pro"
+import { helpers } from "@budibase/shared-core"
 import { cloneDeep } from "lodash"
 
 import * as utils from "../../../db/utils"
@@ -16,7 +17,6 @@ import { isExternalTableID } from "../../../integrations/utils"
 import * as internal from "./internal"
 import * as external from "./external"
 import sdk from "../../../sdk"
-import { isRequired } from "../../../utilities/schema"
 
 function pickApi(tableId: any) {
   if (isExternalTableID(tableId)) {
@@ -58,7 +58,7 @@ async function guardViewSchema(
         throw new HTTPError(`Readonly fields are not enabled`, 400)
       }
 
-      if (isRequired(tableSchemaField.constraints)) {
+      if (helpers.schema.isRequired(tableSchemaField.constraints)) {
         throw new HTTPError(
           `Field "${field}" cannot be readonly as it is a required field`,
           400
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index 7fea417d5a..b4ea1277d6 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -4,7 +4,6 @@ import {
   TableSchema,
   FieldSchema,
   Row,
-  FieldConstraints,
 } from "@budibase/types"
 import { ValidColumnNameRegex, utils } from "@budibase/shared-core"
 import { db } from "@budibase/backend-core"
@@ -41,15 +40,6 @@ export function isRows(rows: any): rows is Rows {
   return Array.isArray(rows) && rows.every(row => typeof row === "object")
 }
 
-export function isRequired(constraints: FieldConstraints | undefined) {
-  const isRequired =
-    !!constraints &&
-    ((typeof constraints.presence !== "boolean" &&
-      constraints.presence?.allowEmpty === false) ||
-      constraints.presence === true)
-  return isRequired
-}
-
 export function validate(rows: Rows, schema: TableSchema): ValidationResults {
   const results: ValidationResults = {
     schemaValidation: {},
diff --git a/packages/shared-core/src/helpers/schema.ts b/packages/shared-core/src/helpers/schema.ts
index ad4c237247..caf562a8cb 100644
--- a/packages/shared-core/src/helpers/schema.ts
+++ b/packages/shared-core/src/helpers/schema.ts
@@ -1,5 +1,6 @@
 import {
   BBReferenceFieldSubType,
+  FieldConstraints,
   FieldSchema,
   FieldType,
 } from "@budibase/types"
@@ -16,3 +17,12 @@ export function isDeprecatedSingleUserColumn(
     schema.constraints?.type !== "array"
   return result
 }
+
+export function isRequired(constraints: FieldConstraints | undefined) {
+  const isRequired =
+    !!constraints &&
+    ((typeof constraints.presence !== "boolean" &&
+      constraints.presence?.allowEmpty === false) ||
+      constraints.presence === true)
+  return isRequired
+}
diff --git a/packages/server/src/utilities/tests/schema.spec.ts b/packages/shared-core/src/helpers/tests/schema.spec.ts
similarity index 100%
rename from packages/server/src/utilities/tests/schema.spec.ts
rename to packages/shared-core/src/helpers/tests/schema.spec.ts

From 42d60ad95b549e6fe9e005dbd584425079da5ef2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 16:56:12 +0200
Subject: [PATCH 042/128] Fix

---
 packages/server/src/utilities/schema.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index b4ea1277d6..8e6cd34c7c 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -5,7 +5,7 @@ import {
   FieldSchema,
   Row,
 } from "@budibase/types"
-import { ValidColumnNameRegex, utils } from "@budibase/shared-core"
+import { ValidColumnNameRegex, helpers, utils } from "@budibase/shared-core"
 import { db } from "@budibase/backend-core"
 import { parseCsvExport } from "../api/controllers/view/exporters"
 
@@ -99,7 +99,7 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults {
           columnData,
           columnType,
           columnSubtype,
-          isRequired(constraints)
+          helpers.schema.isRequired(constraints)
         )
       ) {
         results.schemaValidation[columnName] = false

From cb2349fdeff75aec3bc7ef71ed1e5d4cf2c442b3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 17:04:35 +0200
Subject: [PATCH 043/128] Allow edition display

---
 .../grid/controls/ColumnsSettingButton.svelte | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 3f0e2341be..43efda80fa 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -11,7 +11,9 @@
   let open = false
   let anchor
 
-  $: restrictedColumns = $columns.filter(col => !col.visible || col.readonly)
+  $: allColumns = $stickyColumn ? [$stickyColumn, ...$columns] : $columns
+
+  $: restrictedColumns = allColumns.filter(col => !col.visible || col.readonly)
   $: anyRestricted = restrictedColumns.length
   $: text = anyRestricted ? `Columns (${anyRestricted} restricted)` : "Columns"
 
@@ -34,36 +36,44 @@
     HIDDEN: "hidden",
   }
 
-  const EDIT_OPTION = {
-    icon: "Edit",
-    value: PERMISSION_OPTIONS.WRITABLE,
-    tooltip: "Writable",
-  }
-  $: READONLY_OPTION = {
-    icon: "Visibility",
-    value: PERMISSION_OPTIONS.READONLY,
-    tooltip: allowViewReadonlyColumns
-      ? "Read only"
-      : "Read only (premium feature)",
-    disabled: !allowViewReadonlyColumns,
-  }
-  const HIDDEN_OPTION = {
-    icon: "VisibilityOff",
-    value: PERMISSION_OPTIONS.HIDDEN,
-    tooltip: "Hidden",
-  }
+  $: displayColumns = allColumns.map(c => {
+    const isDisplayColumn = $stickyColumn === c
 
-  $: options =
-    $datasource.type === "viewV2"
-      ? [EDIT_OPTION, READONLY_OPTION, HIDDEN_OPTION]
-      : [EDIT_OPTION, HIDDEN_OPTION]
+    const options = [
+      {
+        icon: "Edit",
+        value: PERMISSION_OPTIONS.WRITABLE,
+        tooltip: "Writable",
+      },
+    ]
+    if ($datasource.type === "viewV2") {
+      options.push({
+        icon: "Visibility",
+        value: PERMISSION_OPTIONS.READONLY,
+        tooltip: allowViewReadonlyColumns
+          ? "Read only"
+          : "Read only (premium feature)",
+        disabled: !allowViewReadonlyColumns,
+      })
+    }
+
+    options.push({
+      icon: "VisibilityOff",
+      value: PERMISSION_OPTIONS.HIDDEN,
+      tooltip: "Hidden",
+      disabled: isDisplayColumn,
+      tooltip: isDisplayColumn && "Display column cannot be hidden",
+    })
+
+    return { ...c, options }
+  })
 
   function columnToPermissionOptions(column) {
-    if (!column.visible) {
+    if (!column.schema.visible) {
       return PERMISSION_OPTIONS.HIDDEN
     }
 
-    if (column.readonly) {
+    if (column.schema.readonly) {
       return PERMISSION_OPTIONS.READONLY
     }
 
@@ -87,19 +97,7 @@
 <Popover bind:open {anchor} align="left">
   <div class="content">
     <div class="columns">
-      {#if $stickyColumn}
-        <div class="column">
-          <Icon size="S" name={getColumnIcon($stickyColumn)} />
-          {$stickyColumn.label}
-        </div>
-
-        <ToggleActionButtonGroup
-          disabled
-          value={PERMISSION_OPTIONS.WRITABLE}
-          options={options.map(o => ({ ...o, disabled: true }))}
-        />
-      {/if}
-      {#each $columns as column}
+      {#each displayColumns as column}
         <div class="column">
           <Icon size="S" name={getColumnIcon(column)} />
           {column.label}
@@ -107,7 +105,7 @@
         <ToggleActionButtonGroup
           on:click={e => toggleColumn(column, e.detail)}
           value={columnToPermissionOptions(column)}
-          {options}
+          options={column.options}
         />
       {/each}
     </div>

From 10f77c83b6ef08522da14181f1aabda05f213cca Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Jun 2024 17:24:30 +0200
Subject: [PATCH 044/128] Don't allow selecting required columns

---
 .../grid/controls/ColumnsSettingButton.svelte     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 43efda80fa..d4ae71280b 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -3,6 +3,7 @@
   import { ActionButton, Popover, Icon, notifications } from "@budibase/bbui"
   import { getColumnIcon } from "../lib/utils"
   import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   export let allowViewReadonlyColumns = false
 
@@ -37,13 +38,17 @@
   }
 
   $: displayColumns = allColumns.map(c => {
+    const isRequired = helpers.schema.isRequired(c.schema.constraints)
     const isDisplayColumn = $stickyColumn === c
 
+    const requiredTooltip = isRequired && "Required columns must be writable"
+
     const options = [
       {
         icon: "Edit",
         value: PERMISSION_OPTIONS.WRITABLE,
-        tooltip: "Writable",
+        tooltip: requiredTooltip || "Writable",
+        disabled: isRequired,
       },
     ]
     if ($datasource.type === "viewV2") {
@@ -51,17 +56,17 @@
         icon: "Visibility",
         value: PERMISSION_OPTIONS.READONLY,
         tooltip: allowViewReadonlyColumns
-          ? "Read only"
+          ? requiredTooltip || "Read only"
           : "Read only (premium feature)",
-        disabled: !allowViewReadonlyColumns,
+        disabled: !allowViewReadonlyColumns || isRequired,
       })
     }
 
     options.push({
       icon: "VisibilityOff",
       value: PERMISSION_OPTIONS.HIDDEN,
-      tooltip: "Hidden",
-      disabled: isDisplayColumn,
+      tooltip: requiredTooltip || "Hidden",
+      disabled: isDisplayColumn || isRequired,
       tooltip: isDisplayColumn && "Display column cannot be hidden",
     })
 

From 20c18259a95cf9303ece127c76456aef7011c10f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 3 Jun 2024 17:38:22 +0100
Subject: [PATCH 045/128] Update CouchDB chart from 4.3.0 to 4.5.3.

---
 charts/budibase/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml
index e2c9378f2c..83a72d203f 100644
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -17,6 +17,6 @@ version: 0.0.0
 appVersion: 0.0.0
 dependencies:
   - name: couchdb
-    version: 4.3.0
+    version: 4.5.3
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled

From b3d7e69046a7bc0cdaef26485ca8f21afdb554f1 Mon Sep 17 00:00:00 2001
From: Hector Valcarcel <hmvalcarcel@gmail.com>
Date: Tue, 4 Jun 2024 10:24:52 +0200
Subject: [PATCH 046/128] feat: add values definition for extra env var using
 secrets ref

---
 charts/budibase/values.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 27037cdaa8..0b86218d2e 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -240,6 +240,13 @@ services:
     # -- Extra environment variables to set for apps pods. Takes a list of
     # name=value pairs.
     extraEnv: []
+    # -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
+    # This can be used to avoid storing sensitive information in the values.yaml file.
+    extraEnvFromSecret: []
+    #  - name: MY_SECRET_KEY
+    #    secretName : my-secret
+    #    secretKey: my-secret-key
+
     # -- Startup probe configuration for apps pods. You shouldn't need to
     # change this, but if you want to you can find more information here:
     # <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>
@@ -323,6 +330,13 @@ services:
     # -- Extra environment variables to set for automation worker pods. Takes a list of
     # name=value pairs.
     extraEnv: []
+    # -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
+    # This can be used to avoid storing sensitive information in the values.yaml file.
+    extraEnvFromSecret: []
+    #  - name: MY_SECRET_KEY
+    #    secretName : my-secret
+    #    secretKey: my-secret-key
+
     # -- Startup probe configuration for automation worker pods. You shouldn't
     # need to change this, but if you want to you can find more information
     # here:
@@ -408,6 +422,13 @@ services:
     # -- Extra environment variables to set for worker pods. Takes a list of
     # name=value pairs.
     extraEnv: []
+    # -- Name of the K8s Secret in the same namespace which contains the extra environment variables.
+    # This can be used to avoid storing sensitive information in the values.yaml file.
+    extraEnvFromSecret: []
+    #  - name: MY_SECRET_KEY
+    #    secretName : my-secret
+    #    secretKey: my-secret-key
+
     # -- Startup probe configuration for worker pods. You shouldn't need to
     # change this, but if you want to you can find more information here:
     # <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>

From d554a8287b74c030ee0254872b869e514ce2da79 Mon Sep 17 00:00:00 2001
From: Hector Valcarcel <hmvalcarcel@gmail.com>
Date: Tue, 4 Jun 2024 10:26:44 +0200
Subject: [PATCH 047/128] feat: attach env vars from 'extraEnvFromSecret'

---
 charts/budibase/templates/app-service-deployment.yaml    | 7 +++++++
 .../templates/automation-worker-service-deployment.yaml  | 9 ++++++++-
 charts/budibase/templates/worker-service-deployment.yaml | 7 +++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index ed7166ec5d..b764065bfc 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -202,6 +202,13 @@ spec:
         - name: {{ .name }}
           value: {{ .value | quote }}
         {{- end }}
+        {{- range .Values.services.apps.extraEnvFromSecret}}
+        - name: {{ .name }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ .secretName }}
+              key: {{ .secretKey | quote }}
+        {{- end}}
         image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         {{- if .Values.services.apps.startupProbe }}
diff --git a/charts/budibase/templates/automation-worker-service-deployment.yaml b/charts/budibase/templates/automation-worker-service-deployment.yaml
index 3c6f94ae9e..38a384626e 100644
--- a/charts/budibase/templates/automation-worker-service-deployment.yaml
+++ b/charts/budibase/templates/automation-worker-service-deployment.yaml
@@ -201,6 +201,13 @@ spec:
         - name: {{ .name }}
           value: {{ .value | quote }}
         {{- end }}
+        {{- range .Values.services.automationWorkers.extraEnvFromSecret}}
+        - name: {{ .name }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ .secretName }}
+              key: {{ .secretKey | quote }}
+        {{- end}}
 
         image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
@@ -272,4 +279,4 @@ spec:
       {{- toYaml .Values.services.automationWorkers.extraVolumes | nindent 8 }}
       {{ end }}
 status: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 66a9bb6c14..1f9d1a8ed7 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -188,6 +188,13 @@ spec:
         - name: {{ .name }}
           value: {{ .value | quote }}
         {{- end }}
+        {{- range .Values.services.worker.extraEnvFromSecret}}
+        - name: {{ .name }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ .secretName }}
+              key: {{ .secretKey | quote }}
+        {{- end}}
         image: budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         {{- if .Values.services.worker.startupProbe }}

From 9b82116c61f7ea9854bea5cefe7dfd1be9c85c19 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 10:39:56 +0200
Subject: [PATCH 048/128] Copy changes

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 3 ++-
 packages/server/src/sdk/app/views/index.ts          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 4e98ffe3cc..663cf5c864 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -345,7 +345,8 @@ describe.each([
         await config.api.viewV2.create(newView, {
           status: 400,
           body: {
-            message: 'You can\'t make read only the required field "name"',
+            message:
+              'You can\'t make field "name" readonly because it is a required field.',
             status: 400,
           },
         })
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index ff51a73e99..6cdd38bf43 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -76,7 +76,7 @@ async function guardViewSchema(
     const viewSchemaField = viewSchema[field.name]
     if (viewSchemaField?.readonly) {
       throw new HTTPError(
-        `You can't make read only the required field "${field.name}"`,
+        `You can't make field "${field.name}" readonly because it is a required field.`,
         400
       )
     }

From 2d953f19cc37a47756a0655cacf7273b19bf0333 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 11:11:50 +0200
Subject: [PATCH 049/128] Clean validation message

---
 .../src/middleware/joi-validator.ts           |  23 +-
 .../server/src/api/routes/utils/validators.ts | 276 ++++++++++--------
 2 files changed, 172 insertions(+), 127 deletions(-)

diff --git a/packages/backend-core/src/middleware/joi-validator.ts b/packages/backend-core/src/middleware/joi-validator.ts
index ac8064a512..5047cdbbc1 100644
--- a/packages/backend-core/src/middleware/joi-validator.ts
+++ b/packages/backend-core/src/middleware/joi-validator.ts
@@ -3,7 +3,8 @@ import { Ctx } from "@budibase/types"
 
 function validate(
   schema: Joi.ObjectSchema | Joi.ArraySchema,
-  property: string
+  property: string,
+  opts: { errorPrefix: string } = { errorPrefix: `Invalid ${property}` }
 ) {
   // Return a Koa middleware function
   return (ctx: Ctx, next: any) => {
@@ -29,16 +30,26 @@ function validate(
 
     const { error } = schema.validate(params)
     if (error) {
-      ctx.throw(400, `Invalid ${property} - ${error.message}`)
+      let message = error.message
+      if (opts.errorPrefix) {
+        message = `Invalid ${property} - ${message}`
+      }
+      ctx.throw(400, message)
     }
     return next()
   }
 }
 
-export function body(schema: Joi.ObjectSchema | Joi.ArraySchema) {
-  return validate(schema, "body")
+export function body(
+  schema: Joi.ObjectSchema | Joi.ArraySchema,
+  opts?: { errorPrefix: string }
+) {
+  return validate(schema, "body", opts)
 }
 
-export function params(schema: Joi.ObjectSchema | Joi.ArraySchema) {
-  return validate(schema, "params")
+export function params(
+  schema: Joi.ObjectSchema | Joi.ArraySchema,
+  opts?: { errorPrefix: string }
+) {
+  return validate(schema, "params", opts)
 }
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index 0a4eff4247..9a726dc757 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -40,42 +40,49 @@ const validateViewSchemas: CustomValidator<Table> = (table, helpers) => {
 }
 
 export function tableValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: OPTIONAL_STRING,
-    _rev: OPTIONAL_STRING,
-    type: OPTIONAL_STRING.valid("table", "internal", "external"),
-    primaryDisplay: OPTIONAL_STRING,
-    schema: Joi.object().required(),
-    name: Joi.string().required(),
-    views: Joi.object(),
-    rows: Joi.array(),
-  }).custom(validateViewSchemas).unknown(true))
+  return auth.joiValidator.body(
+    Joi.object({
+      _id: OPTIONAL_STRING,
+      _rev: OPTIONAL_STRING,
+      type: OPTIONAL_STRING.valid("table", "internal", "external"),
+      primaryDisplay: OPTIONAL_STRING,
+      schema: Joi.object().required(),
+      name: Joi.string().required(),
+      views: Joi.object(),
+      rows: Joi.array(),
+    })
+      .custom(validateViewSchemas)
+      .unknown(true),
+    { errorPrefix: "" }
+  )
 }
 
 export function nameValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    name: OPTIONAL_STRING,
-  }))
+  return auth.joiValidator.body(
+    Joi.object({
+      name: OPTIONAL_STRING,
+    })
+  )
 }
 
 export function datasourceValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: Joi.string(),
-    _rev: Joi.string(),
-    type: OPTIONAL_STRING.allow("datasource_plus"),
-    relationships: Joi.array().items(Joi.object({
-      from: Joi.string().required(),
-      to: Joi.string().required(),
-      cardinality: Joi.valid("1:N", "1:1", "N:N").required()
-    })),
-  }).unknown(true))
+  return auth.joiValidator.body(
+    Joi.object({
+      _id: Joi.string(),
+      _rev: Joi.string(),
+      type: OPTIONAL_STRING.allow("datasource_plus"),
+      relationships: Joi.array().items(
+        Joi.object({
+          from: Joi.string().required(),
+          to: Joi.string().required(),
+          cardinality: Joi.valid("1:N", "1:1", "N:N").required(),
+        })
+      ),
+    }).unknown(true)
+  )
 }
 
 function filterObject() {
-  // prettier-ignore
   return Joi.object({
     string: Joi.object().optional(),
     fuzzy: Joi.object().optional(),
@@ -92,17 +99,20 @@ function filterObject() {
 }
 
 export function internalSearchValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    tableId: OPTIONAL_STRING,
-    query: filterObject(),
-    limit: OPTIONAL_NUMBER,
-    sort: OPTIONAL_STRING,
-    sortOrder: OPTIONAL_STRING,
-    sortType: OPTIONAL_STRING,
-    paginate: Joi.boolean(),
-    bookmark: Joi.alternatives().try(OPTIONAL_STRING, OPTIONAL_NUMBER).optional(),
-  }))
+  return auth.joiValidator.body(
+    Joi.object({
+      tableId: OPTIONAL_STRING,
+      query: filterObject(),
+      limit: OPTIONAL_NUMBER,
+      sort: OPTIONAL_STRING,
+      sortOrder: OPTIONAL_STRING,
+      sortType: OPTIONAL_STRING,
+      paginate: Joi.boolean(),
+      bookmark: Joi.alternatives()
+        .try(OPTIONAL_STRING, OPTIONAL_NUMBER)
+        .optional(),
+    })
+  )
 }
 
 export function externalSearchValidator() {
@@ -124,92 +134,110 @@ export function externalSearchValidator() {
 }
 
 export function datasourceQueryValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    endpoint: Joi.object({
-      datasourceId: Joi.string().required(),
-      operation: Joi.string().required().valid(...Object.values(DataSourceOperation)),
-      entityId: Joi.string().required(),
-    }).required(),
-    resource: Joi.object({
-      fields: Joi.array().items(Joi.string()).optional(),
-    }).optional(),
-    body: Joi.object().optional(),
-    sort: Joi.object().optional(),
-    filters: filterObject().optional(),
-    paginate: Joi.object({
-      page: Joi.string().alphanum().optional(),
-      limit: Joi.number().optional(),
-    }).optional(),
-  }))
+  return auth.joiValidator.body(
+    Joi.object({
+      endpoint: Joi.object({
+        datasourceId: Joi.string().required(),
+        operation: Joi.string()
+          .required()
+          .valid(...Object.values(DataSourceOperation)),
+        entityId: Joi.string().required(),
+      }).required(),
+      resource: Joi.object({
+        fields: Joi.array().items(Joi.string()).optional(),
+      }).optional(),
+      body: Joi.object().optional(),
+      sort: Joi.object().optional(),
+      filters: filterObject().optional(),
+      paginate: Joi.object({
+        page: Joi.string().alphanum().optional(),
+        limit: Joi.number().optional(),
+      }).optional(),
+    })
+  )
 }
 
 export function webhookValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    live: Joi.bool(),
-    _id: OPTIONAL_STRING,
-    _rev: OPTIONAL_STRING,
-    name: Joi.string().required(),
-    bodySchema: Joi.object().optional(),
-    action: Joi.object({
-      type: Joi.string().required().valid(WebhookActionType.AUTOMATION),
-      target: Joi.string().required(),
-    }).required(),
-  }).unknown(true))
+  return auth.joiValidator.body(
+    Joi.object({
+      live: Joi.bool(),
+      _id: OPTIONAL_STRING,
+      _rev: OPTIONAL_STRING,
+      name: Joi.string().required(),
+      bodySchema: Joi.object().optional(),
+      action: Joi.object({
+        type: Joi.string().required().valid(WebhookActionType.AUTOMATION),
+        target: Joi.string().required(),
+      }).required(),
+    }).unknown(true)
+  )
 }
 
 export function roleValidator() {
   const permLevelArray = Object.values(permissions.PermissionLevel)
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: OPTIONAL_STRING,
-    _rev: OPTIONAL_STRING,
-    name: Joi.string().regex(/^[a-zA-Z0-9_]*$/).required(),
-    // this is the base permission ID (for now a built in)
-    permissionId: Joi.string().valid(...Object.values(permissions.BuiltinPermissionID)).required(),
-    permissions: Joi.object()
-      .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
-      .optional(),
-    inherits: OPTIONAL_STRING,
-  }).unknown(true))
+
+  return auth.joiValidator.body(
+    Joi.object({
+      _id: OPTIONAL_STRING,
+      _rev: OPTIONAL_STRING,
+      name: Joi.string()
+        .regex(/^[a-zA-Z0-9_]*$/)
+        .required(),
+      // this is the base permission ID (for now a built in)
+      permissionId: Joi.string()
+        .valid(...Object.values(permissions.BuiltinPermissionID))
+        .required(),
+      permissions: Joi.object()
+        .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
+        .optional(),
+      inherits: OPTIONAL_STRING,
+    }).unknown(true)
+  )
 }
 
 export function permissionValidator() {
   const permLevelArray = Object.values(permissions.PermissionLevel)
-  // prettier-ignore
-  return auth.joiValidator.params(Joi.object({
-    level: Joi.string().valid(...permLevelArray).required(),
-    resourceId: Joi.string(),
-    roleId: Joi.string(),
-  }).unknown(true))
+
+  return auth.joiValidator.params(
+    Joi.object({
+      level: Joi.string()
+        .valid(...permLevelArray)
+        .required(),
+      resourceId: Joi.string(),
+      roleId: Joi.string(),
+    }).unknown(true)
+  )
 }
 
 export function screenValidator() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    name: Joi.string().required(),
-    showNavigation: OPTIONAL_BOOLEAN,
-    width: OPTIONAL_STRING,
-    routing: Joi.object({
-      route: Joi.string().required(),
-      roleId: Joi.string().required().allow(""),
-      homeScreen: OPTIONAL_BOOLEAN,
-    }).required().unknown(true),
-    props: Joi.object({
-      _id: Joi.string().required(),
-      _component: Joi.string().required(),
-      _children: Joi.array().required(),
-      _styles: Joi.object().required(),
-      type: OPTIONAL_STRING,
-      table: OPTIONAL_STRING,
-      layoutId: OPTIONAL_STRING,
-    }).required().unknown(true),
-  }).unknown(true))
+  return auth.joiValidator.body(
+    Joi.object({
+      name: Joi.string().required(),
+      showNavigation: OPTIONAL_BOOLEAN,
+      width: OPTIONAL_STRING,
+      routing: Joi.object({
+        route: Joi.string().required(),
+        roleId: Joi.string().required().allow(""),
+        homeScreen: OPTIONAL_BOOLEAN,
+      })
+        .required()
+        .unknown(true),
+      props: Joi.object({
+        _id: Joi.string().required(),
+        _component: Joi.string().required(),
+        _children: Joi.array().required(),
+        _styles: Joi.object().required(),
+        type: OPTIONAL_STRING,
+        table: OPTIONAL_STRING,
+        layoutId: OPTIONAL_STRING,
+      })
+        .required()
+        .unknown(true),
+    }).unknown(true)
+  )
 }
 
 function generateStepSchema(allowStepTypes: string[]) {
-  // prettier-ignore
   return Joi.object({
     stepId: Joi.string().required(),
     id: Joi.string().required(),
@@ -219,33 +247,39 @@ function generateStepSchema(allowStepTypes: string[]) {
     icon: Joi.string().required(),
     params: Joi.object(),
     args: Joi.object(),
-    type: Joi.string().required().valid(...allowStepTypes),
+    type: Joi.string()
+      .required()
+      .valid(...allowStepTypes),
   }).unknown(true)
 }
 
 export function automationValidator(existing = false) {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: existing ? Joi.string().required() : OPTIONAL_STRING,
-    _rev: existing ? Joi.string().required() : OPTIONAL_STRING,
-    name: Joi.string().required(),
-    type: Joi.string().valid("automation").required(),
-    definition: Joi.object({
-      steps: Joi.array().required().items(generateStepSchema(["ACTION", "LOGIC"])),
-      trigger: generateStepSchema(["TRIGGER"]).allow(null),
-    }).required().unknown(true),
-  }).unknown(true))
+  return auth.joiValidator.body(
+    Joi.object({
+      _id: existing ? Joi.string().required() : OPTIONAL_STRING,
+      _rev: existing ? Joi.string().required() : OPTIONAL_STRING,
+      name: Joi.string().required(),
+      type: Joi.string().valid("automation").required(),
+      definition: Joi.object({
+        steps: Joi.array()
+          .required()
+          .items(generateStepSchema(["ACTION", "LOGIC"])),
+        trigger: generateStepSchema(["TRIGGER"]).allow(null),
+      })
+        .required()
+        .unknown(true),
+    }).unknown(true)
+  )
 }
 
 export function applicationValidator(opts = { isCreate: true }) {
-  // prettier-ignore
   const base: any = {
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     url: OPTIONAL_STRING,
     template: Joi.object({
       templateString: OPTIONAL_STRING,
-    })
+    }),
   }
 
   const appNameValidator = Joi.string()

From 819cc6bebb8c2db492c2bbfe8641200bf8dc5b47 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 11:18:33 +0200
Subject: [PATCH 050/128] Fix tests

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 663cf5c864..3376cb86fa 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -1424,8 +1424,7 @@ describe.each([
             status: 400,
             body: {
               status: 400,
-              message:
-                'Invalid body - Required field "name" is missing in view "view a"',
+              message: 'Required field "name" is missing in view "view a"',
             },
           }
         )
@@ -1455,8 +1454,7 @@ describe.each([
             status: 400,
             body: {
               status: 400,
-              message:
-                'Invalid body - Required field "name" is missing in view "view a"',
+              message: 'Required field "name" is missing in view "view a"',
             },
           }
         )

From aefedce568168d116e9046b12278cfca1a4f69fa Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 11:35:09 +0200
Subject: [PATCH 051/128] Renames

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 6 ++++--
 packages/server/src/api/routes/utils/validators.ts  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 3376cb86fa..cf9db761ce 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -1424,7 +1424,8 @@ describe.each([
             status: 400,
             body: {
               status: 400,
-              message: 'Required field "name" is missing in view "view a"',
+              message:
+                'To make field "name" required, this field must be present and writable in views: view a.',
             },
           }
         )
@@ -1454,7 +1455,8 @@ describe.each([
             status: 400,
             body: {
               status: 400,
-              message: 'Required field "name" is missing in view "view a"',
+              message:
+                'To make field "name" required, this field must be present and writable in views: view a.',
             },
           }
         )
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index 9a726dc757..e2cc463f38 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -30,7 +30,7 @@ const validateViewSchemas: CustomValidator<Table> = (table, helpers) => {
         )
         if (missingField) {
           return helpers.message({
-            custom: `Required field "${missingField}" is missing in view "${view.name}"`,
+            custom: `To make field "${missingField}" required, this field must be present and writable in views: ${view.name}.`,
           })
         }
       }

From 1c8feaedb1da457c5593732025467604de810367 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 12:03:42 +0200
Subject: [PATCH 052/128] Copy change

---
 packages/server/src/api/routes/tests/viewV2.spec.ts | 2 +-
 packages/server/src/sdk/app/views/index.ts          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index b0ffd1e85c..650c36794b 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -369,7 +369,7 @@ describe.each([
           status: 400,
           body: {
             message:
-              'You can\'t make field "name" readonly because it is a required field.',
+              'You can\'t make "name" readonly because it is a required field.',
             status: 400,
           },
         })
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 52ab323faa..f82ef133d7 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -77,14 +77,14 @@ async function guardViewSchema(
 
     if (!viewSchemaField?.visible) {
       throw new HTTPError(
-        `You can't hide the required field "${field.name}"`,
+        `You can't hide "${field.name} because it is a required field."`,
         400
       )
     }
 
     if (viewSchemaField.readonly) {
       throw new HTTPError(
-        `You can't make field "${field.name}" readonly because it is a required field.`,
+        `You can't make "${field.name}" readonly because it is a required field.`,
         400
       )
     }

From b65e9cfc80c08deea471b3cad8e33a1d8508f9d6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 12:20:19 +0200
Subject: [PATCH 053/128] Lint

---
 .../components/grid/controls/ColumnsSettingButton.svelte    | 6 ++++--
 packages/server/src/api/routes/utils/validators.ts          | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 7f54dbf582..9f7ced013d 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -71,9 +71,11 @@
     options.push({
       icon: "VisibilityOff",
       value: PERMISSION_OPTIONS.HIDDEN,
-      tooltip: requiredTooltip || "Hidden",
       disabled: isDisplayColumn || isRequired,
-      tooltip: isDisplayColumn && "Display column cannot be hidden",
+      tooltip:
+        (isDisplayColumn && "Display column cannot be hidden") ||
+        requiredTooltip ||
+        "Hidden",
     })
 
     return { ...c, options }
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index e2cc463f38..a63b29fe5a 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -2,10 +2,11 @@ import { auth, permissions } from "@budibase/backend-core"
 import { DataSourceOperation } from "../../../constants"
 import { Table, WebhookActionType } from "@budibase/types"
 import Joi, { CustomValidator } from "joi"
-import { ValidSnippetNameRegex } from "@budibase/shared-core"
-import { isRequired } from "../../../utilities/schema"
+import { ValidSnippetNameRegex, helpers } from "@budibase/shared-core"
 import sdk from "../../../sdk"
 
+const { isRequired } = helpers.schema
+
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)

From e6e67af2c4f3e151cbe2f1dfd1afd5a7e0acc008 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 12:32:33 +0200
Subject: [PATCH 054/128] Guard display name column

---
 packages/server/src/sdk/app/views/index.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 07c207e334..b088051773 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -37,9 +37,9 @@ export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
 
 async function guardViewSchema(
   tableId: string,
-  viewSchema?: Record<string, ViewUIFieldMetadata>
+  view: Omit<ViewV2, "id" | "version">
 ) {
-  viewSchema ??= {}
+  const viewSchema = view.schema || {}
   const table = await sdk.tables.getTable(tableId)
 
   for (const field of Object.keys(viewSchema)) {
@@ -89,19 +89,30 @@ async function guardViewSchema(
       )
     }
   }
+
+  if (view.primaryDisplay) {
+    const viewSchemaField = viewSchema[view.primaryDisplay]
+
+    if (!viewSchemaField?.visible) {
+      throw new HTTPError(
+        `You can't hide "${view.primaryDisplay}" because it is the display column.`,
+        400
+      )
+    }
+  }
 }
 
 export async function create(
   tableId: string,
   viewRequest: Omit<ViewV2, "id" | "version">
 ): Promise<ViewV2> {
-  await guardViewSchema(tableId, viewRequest.schema)
+  await guardViewSchema(tableId, viewRequest)
 
   return pickApi(tableId).create(tableId, viewRequest)
 }
 
 export async function update(tableId: string, view: ViewV2): Promise<ViewV2> {
-  await guardViewSchema(tableId, view.schema)
+  await guardViewSchema(tableId, view)
 
   return pickApi(tableId).update(tableId, view)
 }

From edd9ebc38923d40149eb6554360c60893e0e51d9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 12:33:48 +0200
Subject: [PATCH 055/128] Tests

---
 .../src/api/routes/tests/viewV2.spec.ts       | 78 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 650c36794b..c8035bd578 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -134,7 +134,7 @@ describe.each([
       const newView: Required<CreateViewRequest> = {
         name: generator.name(),
         tableId: table._id!,
-        primaryDisplay: generator.word(),
+        primaryDisplay: "id",
         query: [
           {
             operator: SearchFilterOperator.EQUAL,
@@ -244,7 +244,7 @@ describe.each([
       const newView: CreateViewRequest = {
         name: generator.name(),
         tableId: table._id!,
-        primaryDisplay: generator.word(),
+        primaryDisplay: "id",
         schema: {
           id: { visible: true },
           Price: { visible: true },
@@ -451,6 +451,78 @@ describe.each([
         })
       })
     })
+
+    it("display fields must be visible", async () => {
+      const table = await config.api.table.save(
+        saveTableRequest({
+          schema: {
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+            },
+            description: {
+              name: "description",
+              type: FieldType.STRING,
+            },
+          },
+        })
+      )
+
+      const newView: CreateViewRequest = {
+        name: generator.name(),
+        tableId: table._id!,
+        primaryDisplay: "name",
+        schema: {
+          id: { visible: true },
+          name: {
+            visible: false,
+          },
+        },
+      }
+
+      await config.api.viewV2.create(newView, {
+        status: 400,
+        body: {
+          message: 'You can\'t hide "name" because it is the display column.',
+          status: 400,
+        },
+      })
+    })
+
+    it("display fields can be readonly", async () => {
+      mocks.licenses.useViewReadonlyColumns()
+      const table = await config.api.table.save(
+        saveTableRequest({
+          schema: {
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+            },
+            description: {
+              name: "description",
+              type: FieldType.STRING,
+            },
+          },
+        })
+      )
+
+      const newView: CreateViewRequest = {
+        name: generator.name(),
+        tableId: table._id!,
+        primaryDisplay: "name",
+        schema: {
+          id: { visible: true },
+          name: {
+            visible: true,
+            readonly: true,
+          },
+        },
+      }
+
+      await config.api.viewV2.create(newView, {
+        status: 201,
+      })
+    })
   })
 
   describe("update", () => {
@@ -499,7 +571,7 @@ describe.each([
         id: view.id,
         tableId,
         name: view.name,
-        primaryDisplay: generator.word(),
+        primaryDisplay: "Price",
         query: [
           {
             operator: SearchFilterOperator.EQUAL,

From 8018d957aedcbdff91dd60353da60fbefd424c98 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 12:58:43 +0200
Subject: [PATCH 056/128] Add PR size labeler

---
 .github/workflows/pr-labeler.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/pr-labeler.yml

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
new file mode 100644
index 0000000000..1bfa79dad3
--- /dev/null
+++ b/.github/workflows/pr-labeler.yml
@@ -0,0 +1,25 @@
+name: PR labeler
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  size-labeler:
+    runs-on: ubuntu-latest
+    name: Label the PR size
+    steps:
+      - uses: codelytv/pr-size-labeler@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          xs_label: "xs"
+          xs_max_size: "10"
+          s_label: "s"
+          s_max_size: "100"
+          m_label: "m"
+          m_max_size: "500"
+          l_label: "l"
+          l_max_size: "1000"
+          xl_label: "xl"
+          fail_if_xl: "false"
+          files_to_ignore: "yarn.lock"

From fb7411dee3fca07e30d44363bca44cfeb2d4faef Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 13:03:30 +0200
Subject: [PATCH 057/128] Team label

---
 .github/workflows/pr-labeler.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 1bfa79dad3..d10d67c4b7 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -23,3 +23,18 @@ jobs:
           xl_label: "xl"
           fail_if_xl: "false"
           files_to_ignore: "yarn.lock"
+
+  team-labeler:
+    runs-on: ubuntu-latest
+    name: Label the PR size
+    steps:
+      - uses: rodrigoarias/auto-label-per-user@v1.0.0
+        with:
+          git-token: ${{ secrets.GITHUB_TOKEN }}
+          user-team-map: |
+            {
+                "adrinr": "firestorm"
+                "samwho": "firestorm"
+                "pclmnt": "firestorm"
+                "mike12345567": "firestorm"
+            }

From 63e7421dd56cbfe18ba304628af4394e899328e8 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 4 Jun 2024 12:41:07 +0100
Subject: [PATCH 058/128] acct portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 2a5022fb94..e8136bd1ea 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 2a5022fb946481c9f7a9c38d1413922729972be0
+Subproject commit e8136bd1ea9fa4c61a4bcbeda482abea0b6c3d9f

From 9717c2bd17b89c2c435d76f0f6ff3e4d17029356 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 14:16:29 +0200
Subject: [PATCH 059/128] Fix json

---
 .github/workflows/pr-labeler.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index d10d67c4b7..85f664ca30 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -33,8 +33,8 @@ jobs:
           git-token: ${{ secrets.GITHUB_TOKEN }}
           user-team-map: |
             {
-                "adrinr": "firestorm"
-                "samwho": "firestorm"
-                "pclmnt": "firestorm"
+                "adrinr": "firestorm",
+                "samwho": "firestorm",
+                "pclmnt": "firestorm",
                 "mike12345567": "firestorm"
             }

From cbcba76309a2c418d61a1cd401a016457a94f19b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 14:18:47 +0200
Subject: [PATCH 060/128] Use default labels

---
 .github/workflows/pr-labeler.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 85f664ca30..8a9e20c2ac 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -12,15 +12,10 @@ jobs:
       - uses: codelytv/pr-size-labeler@v1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          xs_label: "xs"
           xs_max_size: "10"
-          s_label: "s"
           s_max_size: "100"
-          m_label: "m"
           m_max_size: "500"
-          l_label: "l"
           l_max_size: "1000"
-          xl_label: "xl"
           fail_if_xl: "false"
           files_to_ignore: "yarn.lock"
 

From c17b12d4669ac3615381ddc8cad5b05a3c8d4133 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 14:19:54 +0200
Subject: [PATCH 061/128] Add concurrency

---
 .github/workflows/pr-labeler.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 8a9e20c2ac..c63e7029ba 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -1,5 +1,9 @@
 name: PR labeler
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     types: [opened, synchronize]

From c8e68978d8eafa2308d342b05ceb51d5b2216ad6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 14:22:30 +0200
Subject: [PATCH 062/128] Label team only on opened

---
 .github/workflows/pr-labeler.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index c63e7029ba..553b87d3cf 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -26,6 +26,7 @@ jobs:
   team-labeler:
     runs-on: ubuntu-latest
     name: Label the PR size
+    if: ${{ github.event.action == 'opened' }}
     steps:
       - uses: rodrigoarias/auto-label-per-user@v1.0.0
         with:

From e131835852088c92e86515b5a4bde7fb6f4582d2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 14:24:38 +0200
Subject: [PATCH 063/128] Use default names

---
 .github/workflows/pr-labeler.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 553b87d3cf..998c95be27 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -11,7 +11,6 @@ on:
 jobs:
   size-labeler:
     runs-on: ubuntu-latest
-    name: Label the PR size
     steps:
       - uses: codelytv/pr-size-labeler@v1
         with:
@@ -25,7 +24,6 @@ jobs:
 
   team-labeler:
     runs-on: ubuntu-latest
-    name: Label the PR size
     if: ${{ github.event.action == 'opened' }}
     steps:
       - uses: rodrigoarias/auto-label-per-user@v1.0.0

From 4221a13fd1cdda5ef9097ae0b06483fbf4e82a61 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jun 2024 14:03:52 +0100
Subject: [PATCH 064/128] Updating pro back to correct reference.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index d3c3077011..5189b83bea 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit d3c3077011a8e20ed3c48dcd6301caca4120b6ac
+Subproject commit 5189b83bea1868574ff7f4c51fe5db38a11badb8

From 595e518df0aceab80d394090fea6a0ccd5acdac9 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 4 Jun 2024 14:32:34 +0100
Subject: [PATCH 065/128] Update CouchDB chart from 4.3.0 to 4.5.5.

---
 charts/budibase/Chart.lock               |   6 +++---
 charts/budibase/Chart.yaml               |   2 +-
 charts/budibase/charts/couchdb-4.3.0.tgz | Bin 14629 -> 0 bytes
 charts/budibase/charts/couchdb-4.5.5.tgz | Bin 0 -> 15743 bytes
 charts/budibase/values.yaml              |   2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 charts/budibase/charts/couchdb-4.3.0.tgz
 create mode 100644 charts/budibase/charts/couchdb-4.5.5.tgz

diff --git a/charts/budibase/Chart.lock b/charts/budibase/Chart.lock
index 3ee752a362..2a59452971 100644
--- a/charts/budibase/Chart.lock
+++ b/charts/budibase/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: couchdb
   repository: https://apache.github.io/couchdb-helm
-  version: 4.3.0
-digest: sha256:94449a7f195b186f5af33ec5aa66d58b36bede240fae710f021ca87837b30606
-generated: "2023-11-20T17:43:02.777596Z"
+  version: 4.5.5
+digest: sha256:bbbf022c77105c43b735539de05fe69e4c9de51581a0e245b3553030d5e44fa9
+generated: "2024-06-04T10:42:00.640809+01:00"
diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml
index 83a72d203f..e0403f90d6 100644
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -17,6 +17,6 @@ version: 0.0.0
 appVersion: 0.0.0
 dependencies:
   - name: couchdb
-    version: 4.5.3
+    version: 4.5.5
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled
diff --git a/charts/budibase/charts/couchdb-4.3.0.tgz b/charts/budibase/charts/couchdb-4.3.0.tgz
deleted file mode 100644
index d3cce28ee630a20d8bdc0051746b6e2dac95f7fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14629
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

diff --git a/charts/budibase/charts/couchdb-4.5.5.tgz b/charts/budibase/charts/couchdb-4.5.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..aba7f07cbbdbecc3bfee932489ed727d8800525f
GIT binary patch
literal 15743
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
HIN1LK`*LPg

literal 0
HcmV?d00001

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 09af0da4a0..2995d0fe7e 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -139,7 +139,7 @@ globals:
     password: ""
 
   sqs:
-    # -- Whether to use the CouchDB "structure query service" or not. This is disabled by
+    # -- Whether to use the CouchDB "structured query service" or not. This is disabled by
     # default for now, but will become the default in a future release.
     enabled: false
     # @ignore

From b0af50e6746af6686e2b8f22dc96deab1a4928c6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 16:17:41 +0200
Subject: [PATCH 066/128] Copy fix

---
 packages/server/src/sdk/app/views/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index b088051773..2d34a3f5a5 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -77,7 +77,7 @@ async function guardViewSchema(
 
     if (!viewSchemaField?.visible) {
       throw new HTTPError(
-        `You can't hide "${field.name} because it is a required field."`,
+        `You can't hide "${field.name}" because it is a required field.`,
         400
       )
     }

From 7aa6af6e134a80e8ef863244ca581352a0243b61 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 16:40:09 +0200
Subject: [PATCH 067/128] Add tests to support existing configs

---
 .../src/api/routes/tests/viewV2.spec.ts       | 48 ++++++++++++++++++-
 packages/server/src/sdk/app/views/index.ts    | 11 ++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index c8035bd578..bc48b54b51 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -22,7 +22,7 @@ import { generator, mocks } from "@budibase/backend-core/tests"
 import { DatabaseName, getDatasource } from "../../../integrations/tests/utils"
 import merge from "lodash/merge"
 import { quotas } from "@budibase/pro"
-import { roles } from "@budibase/backend-core"
+import { db, roles } from "@budibase/backend-core"
 
 describe.each([
   ["internal", undefined],
@@ -840,6 +840,52 @@ describe.each([
         })
       )
     })
+
+    it("updating schema will only validate modified field", async () => {
+      let view = await config.api.viewV2.create({
+        tableId: table._id!,
+        name: generator.guid(),
+        schema: {
+          id: { visible: true },
+          Price: {
+            visible: true,
+          },
+          Category: { visible: true },
+        },
+      })
+
+      // Update the view to an invalid state
+      const tableToUpdate = await config.api.table.get(table._id!)
+      ;(tableToUpdate.views![view.name] as ViewV2).schema!.id.visible = false
+      await db.getDB(config.appId!).put(tableToUpdate)
+
+      view = await config.api.viewV2.get(view.id)
+      await config.api.viewV2.update({
+        ...view,
+        schema: {
+          ...view.schema,
+          Price: {
+            visible: false,
+          },
+        },
+      })
+
+      expect(await config.api.viewV2.get(view.id)).toEqual(
+        expect.objectContaining({
+          schema: {
+            id: expect.objectContaining({
+              visible: false,
+            }),
+            Price: expect.objectContaining({
+              visible: false,
+            }),
+            Category: expect.objectContaining({
+              visible: true,
+            }),
+          },
+        })
+      )
+    })
   })
 
   describe("delete", () => {
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 2d34a3f5a5..b6ac7b6f6b 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -9,7 +9,7 @@ import {
 import { HTTPError, db as dbCore } from "@budibase/backend-core"
 import { features } from "@budibase/pro"
 import { helpers } from "@budibase/shared-core"
-import { cloneDeep } from "lodash"
+import { cloneDeep } from "lodash/fp"
 
 import * as utils from "../../../db/utils"
 import { isExternalTableID } from "../../../integrations/utils"
@@ -68,12 +68,21 @@ async function guardViewSchema(
     }
   }
 
+  const existingView =
+    table?.views && (table.views[view.name] as ViewV2 | undefined)
+
   for (const field of Object.values(table.schema)) {
     if (!helpers.schema.isRequired(field.constraints)) {
       continue
     }
 
     const viewSchemaField = viewSchema[field.name]
+    const existingViewSchema =
+      existingView?.schema && existingView.schema[field.name]
+    if (!viewSchemaField && !existingViewSchema?.visible) {
+      // Supporting existing configs with required columns but hidden in views
+      continue
+    }
 
     if (!viewSchemaField?.visible) {
       throw new HTTPError(

From 47b77d6744f9f7272196201c4a1f6a6f75dc2f7b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 16:46:50 +0200
Subject: [PATCH 068/128] Run test only with internal tables

---
 .../src/api/routes/tests/viewV2.spec.ts       | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index bc48b54b51..375c4c7c77 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -841,51 +841,52 @@ describe.each([
       )
     })
 
-    it("updating schema will only validate modified field", async () => {
-      let view = await config.api.viewV2.create({
-        tableId: table._id!,
-        name: generator.guid(),
-        schema: {
-          id: { visible: true },
-          Price: {
-            visible: true,
-          },
-          Category: { visible: true },
-        },
-      })
-
-      // Update the view to an invalid state
-      const tableToUpdate = await config.api.table.get(table._id!)
-      ;(tableToUpdate.views![view.name] as ViewV2).schema!.id.visible = false
-      await db.getDB(config.appId!).put(tableToUpdate)
-
-      view = await config.api.viewV2.get(view.id)
-      await config.api.viewV2.update({
-        ...view,
-        schema: {
-          ...view.schema,
-          Price: {
-            visible: false,
-          },
-        },
-      })
-
-      expect(await config.api.viewV2.get(view.id)).toEqual(
-        expect.objectContaining({
+    isInternal &&
+      it("updating schema will only validate modified field", async () => {
+        let view = await config.api.viewV2.create({
+          tableId: table._id!,
+          name: generator.guid(),
           schema: {
-            id: expect.objectContaining({
-              visible: false,
-            }),
-            Price: expect.objectContaining({
-              visible: false,
-            }),
-            Category: expect.objectContaining({
+            id: { visible: true },
+            Price: {
               visible: true,
-            }),
+            },
+            Category: { visible: true },
           },
         })
-      )
-    })
+
+        // Update the view to an invalid state
+        const tableToUpdate = await config.api.table.get(table._id!)
+        ;(tableToUpdate.views![view.name] as ViewV2).schema!.id.visible = false
+        await db.getDB(config.appId!).put(tableToUpdate)
+
+        view = await config.api.viewV2.get(view.id)
+        await config.api.viewV2.update({
+          ...view,
+          schema: {
+            ...view.schema,
+            Price: {
+              visible: false,
+            },
+          },
+        })
+
+        expect(await config.api.viewV2.get(view.id)).toEqual(
+          expect.objectContaining({
+            schema: {
+              id: expect.objectContaining({
+                visible: false,
+              }),
+              Price: expect.objectContaining({
+                visible: false,
+              }),
+              Category: expect.objectContaining({
+                visible: true,
+              }),
+            },
+          })
+        )
+      })
   })
 
   describe("delete", () => {

From ac9f5d5d1ee27367366a9bfbf62e256b45646e17 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 4 Jun 2024 16:50:12 +0200
Subject: [PATCH 069/128] Allow editing old configs

---
 .../components/grid/controls/ColumnsSettingButton.svelte   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
index 9f7ced013d..ed94a01e56 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingButton.svelte
@@ -49,12 +49,15 @@
 
     const requiredTooltip = isRequired && "Required columns must be writable"
 
+    const editEnabled =
+      !isRequired ||
+      columnToPermissionOptions(c) !== PERMISSION_OPTIONS.WRITABLE
     const options = [
       {
         icon: "Edit",
         value: PERMISSION_OPTIONS.WRITABLE,
-        tooltip: requiredTooltip || "Writable",
-        disabled: isRequired,
+        tooltip: (!editEnabled && requiredTooltip) || "Writable",
+        disabled: !editEnabled,
       },
     ]
     if ($datasource.type === "viewV2") {

From cf6f86cb2f4cbf346e5919c63c69cf37c1df256a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jun 2024 17:24:11 +0100
Subject: [PATCH 070/128] Updating migrations to correctly cover all the
 required elements.

---
 .../backend-core/src/db/couch/DatabaseImpl.ts |  3 +-
 .../20231229122514_update_link_documents.ts   | 32 -----------
 .../20240604153647_update_link_documents.ts   | 57 +++++++++++++++++++
 .../server/src/sdk/app/tables/internal/sqs.ts | 13 ++++-
 packages/types/src/documents/app/sqlite.ts    |  5 +-
 packages/types/src/sdk/db.ts                  | 10 ++++
 6 files changed, 84 insertions(+), 36 deletions(-)
 delete mode 100644 packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
 create mode 100644 packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts

diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 8194d1aabf..1fa1e50e7e 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -8,6 +8,7 @@ import {
   DatabaseOpts,
   DatabasePutOpts,
   DatabaseQueryOpts,
+  DBError,
   Document,
   isDocument,
   RowResponse,
@@ -41,7 +42,7 @@ function buildNano(couchInfo: { url: string; cookie: string }) {
 
 type DBCall<T> = () => Promise<T>
 
-class CouchDBError extends Error {
+class CouchDBError extends Error implements DBError {
   status: number
   statusCode: number
   reason: string
diff --git a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
deleted file mode 100644
index adaa0653c4..0000000000
--- a/packages/server/src/appMigrations/migrations/20231229122514_update_link_documents.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { context } from "@budibase/backend-core"
-import { allLinkDocs } from "../../db/utils"
-import LinkDocumentImpl from "../../db/linkedRows/LinkDocument"
-
-const migration = async () => {
-  const linkDocs = await allLinkDocs()
-
-  const docsToUpdate = []
-  for (const linkDoc of linkDocs) {
-    if (linkDoc.tableId) {
-      // It already had the required data
-      continue
-    }
-
-    linkDoc.tableId = new LinkDocumentImpl(
-      linkDoc.doc1.tableId,
-      linkDoc.doc1.fieldName,
-      linkDoc.doc1.rowId,
-      linkDoc.doc2.tableId,
-      linkDoc.doc2.fieldName,
-      linkDoc.doc2.rowId
-    ).tableId
-    docsToUpdate.push(linkDoc)
-  }
-
-  if (docsToUpdate.length) {
-    const db = context.getAppDB()
-    await db.bulkDocs(docsToUpdate)
-  }
-}
-
-export default migration
diff --git a/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
new file mode 100644
index 0000000000..475e7c721c
--- /dev/null
+++ b/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
@@ -0,0 +1,57 @@
+import { context } from "@budibase/backend-core"
+import { allLinkDocs } from "../../db/utils"
+import LinkDocumentImpl from "../../db/linkedRows/LinkDocument"
+import sdk from "../../sdk"
+import env from "../../environment"
+import { DBError } from "@budibase/types"
+
+const migration = async () => {
+  const linkDocs = await allLinkDocs()
+
+  const docsToUpdate = []
+  for (const linkDoc of linkDocs) {
+    if (linkDoc.tableId) {
+      // It already had the required data
+      continue
+    }
+
+    // it already has the junction table ID - no need to migrate
+    if (!linkDoc.tableId) {
+      linkDoc.tableId = new LinkDocumentImpl(
+        linkDoc.doc1.tableId,
+        linkDoc.doc1.fieldName,
+        linkDoc.doc1.rowId,
+        linkDoc.doc2.tableId,
+        linkDoc.doc2.fieldName,
+        linkDoc.doc2.rowId
+      ).tableId
+      docsToUpdate.push(linkDoc)
+    }
+  }
+
+  const db = context.getAppDB()
+  if (docsToUpdate.length) {
+    await db.bulkDocs(docsToUpdate)
+  }
+
+  // at the end make sure design doc is ready
+  await sdk.tables.sqs.syncDefinition()
+  // only do initial search if environment is using SQS already
+  if (env.SQS_SEARCH_ENABLE) {
+    const tables = await sdk.tables.getAllInternalTables()
+    // do these one by one - running in parallel could cause problems
+    for (let table of tables) {
+      try {
+        await db.sql(`select * from ${table._id} limit 1`)
+      } catch (err) {
+        if (typeof err === "object") {
+          const dbErr = err as DBError
+          throw new Error(`Failed to run initial SQS search - ${dbErr.message}`)
+        }
+        throw err
+      }
+    }
+  }
+}
+
+export default migration
diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts
index eb57d1f3b8..b0c6f28be7 100644
--- a/packages/server/src/sdk/app/tables/internal/sqs.ts
+++ b/packages/server/src/sdk/app/tables/internal/sqs.ts
@@ -107,8 +107,17 @@ async function buildBaseDefinition(): Promise<PreSaveSQLiteDefinition> {
 
 export async function syncDefinition(): Promise<void> {
   const db = context.getAppDB()
-  const definition = await buildBaseDefinition()
-  await db.put(definition)
+  let rev: string | undefined
+  try {
+    const existing = await db.get(SQLITE_DESIGN_DOC_ID)
+    rev = existing._rev
+  } finally {
+    const definition = await buildBaseDefinition()
+    if (rev) {
+      definition._rev = rev
+    }
+    await db.put(definition)
+  }
 }
 
 export async function addTable(table: Table) {
diff --git a/packages/types/src/documents/app/sqlite.ts b/packages/types/src/documents/app/sqlite.ts
index 5636fef15b..516669bd59 100644
--- a/packages/types/src/documents/app/sqlite.ts
+++ b/packages/types/src/documents/app/sqlite.ts
@@ -30,4 +30,7 @@ export interface SQLiteDefinition {
   }
 }
 
-export type PreSaveSQLiteDefinition = Omit<SQLiteDefinition, "_rev">
+export interface PreSaveSQLiteDefinition
+  extends Omit<SQLiteDefinition, "_rev"> {
+  _rev?: string
+}
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 7ad740ad05..63c37195b7 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -165,3 +165,13 @@ export interface Database {
   deleteIndex(...args: any[]): Promise<any>
   getIndexes(...args: any[]): Promise<any>
 }
+
+export interface DBError extends Error {
+  status: number
+  statusCode: number
+  reason: string
+  name: string
+  errid: string
+  error: string
+  description: string
+}

From f735f8c6f50c9da63710e3b635df5288244e4bed Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jun 2024 17:24:56 +0100
Subject: [PATCH 071/128] Comment update.

---
 .../migrations/20240604153647_update_link_documents.ts          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
index 475e7c721c..d092f416ff 100644
--- a/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
+++ b/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
@@ -37,6 +37,8 @@ const migration = async () => {
   // at the end make sure design doc is ready
   await sdk.tables.sqs.syncDefinition()
   // only do initial search if environment is using SQS already
+  // initial search makes sure that all the indexes have been created
+  // and are ready to use, avoiding any initial waits for large tables
   if (env.SQS_SEARCH_ENABLE) {
     const tables = await sdk.tables.getAllInternalTables()
     // do these one by one - running in parallel could cause problems

From dbda7b5ee4ee2117adc88540c677a4f595ba0e8f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jun 2024 17:25:44 +0100
Subject: [PATCH 072/128] Updating migration name.

---
 packages/server/src/appMigrations/migrations.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts
index 544e702867..3d14bd5fa6 100644
--- a/packages/server/src/appMigrations/migrations.ts
+++ b/packages/server/src/appMigrations/migrations.ts
@@ -2,12 +2,12 @@
 
 import { AppMigration } from "."
 
-import m20231229122514_update_link_documents from "./migrations/20231229122514_update_link_documents"
+import m20240604153647_update_link_documents from "./migrations/20240604153647_update_link_documents"
 
 export const MIGRATIONS: AppMigration[] = [
   // Migrations will be executed sorted by id
   {
-    id: "20231229122514_update_link_documents",
-    func: m20231229122514_update_link_documents
+    id: "20240604153647_update_link_documents",
+    func: m20240604153647_update_link_documents,
   },
 ]

From f062b73852590fbe5392d71f00ecb62a86262c7e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jun 2024 17:39:53 +0100
Subject: [PATCH 073/128] Only run migration if SQS is enabled.

---
 .../server/src/appMigrations/migrations.ts    | 20 +++++++++++--------
 ...ments.ts => 20240604153647_initial_sqs.ts} |  0
 2 files changed, 12 insertions(+), 8 deletions(-)
 rename packages/server/src/appMigrations/migrations/{20240604153647_update_link_documents.ts => 20240604153647_initial_sqs.ts} (100%)

diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts
index 3d14bd5fa6..48b7f8f0b2 100644
--- a/packages/server/src/appMigrations/migrations.ts
+++ b/packages/server/src/appMigrations/migrations.ts
@@ -1,13 +1,17 @@
 // This file should never be manually modified, use `yarn add-app-migration` in order to add a new one
 
+import env from "../environment"
 import { AppMigration } from "."
 
-import m20240604153647_update_link_documents from "./migrations/20240604153647_update_link_documents"
+import m20240604153647_initial_sqs from "./migrations/20240604153647_initial_sqs"
 
-export const MIGRATIONS: AppMigration[] = [
-  // Migrations will be executed sorted by id
-  {
-    id: "20240604153647_update_link_documents",
-    func: m20240604153647_update_link_documents,
-  },
-]
+// Migrations will be executed sorted by ID
+export const MIGRATIONS: AppMigration[] = []
+
+// only run the SQS migration if SQS is enabled
+if (env.SQS_SEARCH_ENABLE) {
+  MIGRATIONS.push({
+    id: "20240604153647_initial_sqs",
+    func: m20240604153647_initial_sqs,
+  })
+}
diff --git a/packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
similarity index 100%
rename from packages/server/src/appMigrations/migrations/20240604153647_update_link_documents.ts
rename to packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts

From 32e4493a96973d857a93f60447e6076a2744afb8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 5 Jun 2024 11:58:40 +0100
Subject: [PATCH 074/128] Quick fix for using the roles option within the
 builder - this was broken in JS which was a bit of a pain - this works
 properly now and allows more compat between HBS and JS.

---
 packages/builder/src/dataBinding.js                 | 2 +-
 packages/string-templates/src/helpers/javascript.ts | 5 +++++
 packages/string-templates/test/javascript.spec.ts   | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 4e48c237ca..64257e7a7b 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -728,7 +728,7 @@ const getRoleBindings = () => {
   return (get(rolesStore) || []).map(role => {
     return {
       type: "context",
-      runtimeBinding: `trim "${role._id}"`,
+      runtimeBinding: `'${role._id}'`,
       readableBinding: `Role.${role.name}`,
       category: "Role",
       icon: "UserGroup",
diff --git a/packages/string-templates/src/helpers/javascript.ts b/packages/string-templates/src/helpers/javascript.ts
index 931cc46dc7..3e16d8a07b 100644
--- a/packages/string-templates/src/helpers/javascript.ts
+++ b/packages/string-templates/src/helpers/javascript.ts
@@ -33,7 +33,12 @@ const removeSquareBrackets = (value: string) => {
 // Our context getter function provided to JS code as $.
 // Extracts a value from context.
 const getContextValue = (path: string, context: any) => {
+  const literalStringRegex = /^(["'`]).*\1$/
   let data = context
+  // check if it's a literal string - just return path if its quoted
+  if (literalStringRegex.test(path)) {
+    return path.substring(1, path.length - 1)
+  }
   path.split(".").forEach(key => {
     if (data == null || typeof data !== "object") {
       return null
diff --git a/packages/string-templates/test/javascript.spec.ts b/packages/string-templates/test/javascript.spec.ts
index cb2f765007..99e6ee122a 100644
--- a/packages/string-templates/test/javascript.spec.ts
+++ b/packages/string-templates/test/javascript.spec.ts
@@ -149,4 +149,11 @@ describe("Javascript", () => {
       expect(output).toMatch(UUID_REGEX)
     })
   })
+
+  describe("JS literal strings", () => {
+    it("should be able to handle a literal string that is quoted (like role IDs)", () => {
+      const output = processJS(`return $("'Custom'")`)
+      expect(output).toBe("Custom")
+    })
+  })
 })

From c9fb6e35c82d76412c472617b558f46f8b50f958 Mon Sep 17 00:00:00 2001
From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:29:07 +0100
Subject: [PATCH 075/128] Enhancement: add ability to set custom auto-dismissal
 duration for notifications (#13829)

* Enhancement: add ability to set custom auto-dismissal duration for notifications

* Updated based on feedback.

* Enforce max duration for auto-dismiss to 2 minutes
---
 .../actions/ShowNotification.svelte           | 20 ++++++++++++++++
 packages/client/src/stores/notification.js    | 24 ++++++++++---------
 packages/client/src/utils/buttonActions.js    |  4 ++--
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
index d95e13cb5f..ef6232b382 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
@@ -25,6 +25,8 @@
     },
   ]
 
+  const MAX_DURATION = 120000 // Maximum duration in milliseconds (2 minutes)
+
   onMount(() => {
     if (!parameters.type) {
       parameters.type = "success"
@@ -33,6 +35,14 @@
       parameters.autoDismiss = true
     }
   })
+
+  function handleDurationChange(event) {
+    let newDuration = event.detail
+    if (newDuration > MAX_DURATION) {
+      newDuration = MAX_DURATION
+    }
+    parameters.duration = newDuration
+  }
 </script>
 
 <div class="root">
@@ -47,6 +57,16 @@
   />
   <Label />
   <Checkbox text="Auto dismiss" bind:value={parameters.autoDismiss} />
+  {#if parameters.autoDismiss}
+    <Label>Duration (ms)</Label>
+    <DrawerBindableInput
+      title="Duration"
+      {bindings}
+      value={parameters.duration}
+      placeholder="3000"
+      on:change={handleDurationChange}
+    />
+  {/if}
 </div>
 
 <style>
diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.js
index 2a9f9749ec..054117aaba 100644
--- a/packages/client/src/stores/notification.js
+++ b/packages/client/src/stores/notification.js
@@ -1,7 +1,7 @@
 import { writable, get } from "svelte/store"
 import { routeStore } from "./routes"
 
-const NOTIFICATION_TIMEOUT = 3000
+const DEFAULT_NOTIFICATION_TIMEOUT = 3000
 
 const createNotificationStore = () => {
   let block = false
@@ -18,13 +18,13 @@ const createNotificationStore = () => {
     type = "info",
     icon,
     autoDismiss = true,
+    duration,
     count = 1
   ) => {
     if (block) {
       return
     }
 
-    // If peeking, pass notifications back to parent window
     if (get(routeStore).queryParams?.peek) {
       window.parent.postMessage({
         type: "notification",
@@ -32,11 +32,13 @@ const createNotificationStore = () => {
           message,
           type,
           icon,
+          duration,
           autoDismiss,
         },
       })
       return
     }
+
     const _id = id()
     store.update(state => {
       const duplicateError = state.find(err => err.message === message)
@@ -60,7 +62,7 @@ const createNotificationStore = () => {
     if (autoDismiss) {
       setTimeout(() => {
         dismiss(_id)
-      }, NOTIFICATION_TIMEOUT)
+      }, duration || DEFAULT_NOTIFICATION_TIMEOUT)
     }
   }
 
@@ -74,14 +76,14 @@ const createNotificationStore = () => {
     subscribe: store.subscribe,
     actions: {
       send,
-      info: (msg, autoDismiss) =>
-        send(msg, "info", "Info", autoDismiss ?? true),
-      success: (msg, autoDismiss) =>
-        send(msg, "success", "CheckmarkCircle", autoDismiss ?? true),
-      warning: (msg, autoDismiss) =>
-        send(msg, "warning", "Alert", autoDismiss ?? true),
-      error: (msg, autoDismiss) =>
-        send(msg, "error", "Alert", autoDismiss ?? false),
+      info: (msg, autoDismiss, duration) =>
+        send(msg, "info", "Info", autoDismiss ?? true, duration),
+      success: (msg, autoDismiss, duration) =>
+        send(msg, "success", "CheckmarkCircle", autoDismiss ?? true, duration),
+      warning: (msg, autoDismiss, duration) =>
+        send(msg, "warning", "Alert", autoDismiss ?? true, duration),
+      error: (msg, autoDismiss, duration) =>
+        send(msg, "error", "Alert", autoDismiss ?? false, duration),
       blockNotifications,
       dismiss,
     },
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 25e0892fc0..482b36cdb8 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -416,11 +416,11 @@ const continueIfHandler = action => {
 }
 
 const showNotificationHandler = action => {
-  const { message, type, autoDismiss } = action.parameters
+  const { message, type, autoDismiss, duration } = action.parameters
   if (!message || !type) {
     return
   }
-  notificationStore.actions[type]?.(message, autoDismiss)
+  notificationStore.actions[type]?.(message, autoDismiss, duration)
 }
 
 const promptUserHandler = () => {}

From c6bf3e445b927fb8d009f7d9cef99f83c4cefd0b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 5 Jun 2024 12:14:06 +0000
Subject: [PATCH 076/128] Bump version to 2.28.0

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index d90f7732a2..a43a2b7095 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.27.6",
+  "version": "2.28.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From b0c21b01c044522c3c412c314e8e3389a4311018 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 5 Jun 2024 16:04:40 +0200
Subject: [PATCH 077/128] Allow "viewReadonlyColumns" in enterprise

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 5189b83bea..0fca4fb090 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 5189b83bea1868574ff7f4c51fe5db38a11badb8
+Subproject commit 0fca4fb09047df7c36889c5e64f40b2d79d6da47

From 2ab6f5aaf77e81df693e9ca71cb845b813a68d2a Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 5 Jun 2024 15:13:39 +0100
Subject: [PATCH 078/128] Get SQS working in the Helm chart.

---
 charts/budibase/Chart.lock               |   6 +++---
 charts/budibase/Chart.yaml               |   2 +-
 charts/budibase/charts/couchdb-4.5.5.tgz | Bin 15743 -> 0 bytes
 charts/budibase/charts/couchdb-4.5.6.tgz | Bin 0 -> 15786 bytes
 charts/budibase/values.yaml              |  15 +++++++++++++++
 5 files changed, 19 insertions(+), 4 deletions(-)
 delete mode 100644 charts/budibase/charts/couchdb-4.5.5.tgz
 create mode 100644 charts/budibase/charts/couchdb-4.5.6.tgz

diff --git a/charts/budibase/Chart.lock b/charts/budibase/Chart.lock
index 2a59452971..8ff1d36941 100644
--- a/charts/budibase/Chart.lock
+++ b/charts/budibase/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: couchdb
   repository: https://apache.github.io/couchdb-helm
-  version: 4.5.5
-digest: sha256:bbbf022c77105c43b735539de05fe69e4c9de51581a0e245b3553030d5e44fa9
-generated: "2024-06-04T10:42:00.640809+01:00"
+  version: 4.5.6
+digest: sha256:405f098633e632d6f4e140175f156ed4f02918b0d89193f1b66c9cbea211d6c9
+generated: "2024-06-05T14:41:05.979052+01:00"
diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml
index e0403f90d6..a16eba8982 100644
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -17,6 +17,6 @@ version: 0.0.0
 appVersion: 0.0.0
 dependencies:
   - name: couchdb
-    version: 4.5.5
+    version: 4.5.6
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled
diff --git a/charts/budibase/charts/couchdb-4.5.5.tgz b/charts/budibase/charts/couchdb-4.5.5.tgz
deleted file mode 100644
index aba7f07cbbdbecc3bfee932489ed727d8800525f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15743
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
HIN1LK`*LPg

diff --git a/charts/budibase/charts/couchdb-4.5.6.tgz b/charts/budibase/charts/couchdb-4.5.6.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a9211ed279d7ba5f29eccab985ed69cb78aac941
GIT binary patch
literal 15786
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
JFn4gU{{t11Wq1Gp

literal 0
HcmV?d00001

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 2995d0fe7e..58bd889857 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -645,6 +645,21 @@ couchdb:
     # @ignore
     pullPolicy: Always
 
+  extraPorts:
+    # -- Extra ports to expose on the CouchDB service. We expose the SQS port
+    # by default, but you can add more ports here if you need to.
+    - name: sqs
+      containerPort: 4984
+
+  service:
+    extraPorts:
+      # -- Extra ports to expose on the CouchDB service. We expose the SQS port
+      # by default, but you can add more ports here if you need to.
+      - name: sqs
+        port: 4984
+        targetPort: 4984
+        protocol: TCP
+
   # @ignore
   # This should remain false. We ship Clouseau ourselves as part of the
   # budibase/couchdb image, and it's not possible to disable it because it's a

From 91c09e70fdee18780d5bc18cd5673f752361b267 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 5 Jun 2024 15:13:59 +0100
Subject: [PATCH 079/128] Run helm-docs

---
 charts/budibase/README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/budibase/README.md b/charts/budibase/README.md
index 207992087d..c944ed1397 100644
--- a/charts/budibase/README.md
+++ b/charts/budibase/README.md
@@ -112,7 +112,9 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | awsAlbIngress.enabled | bool | `false` | Whether to create an ALB Ingress resource pointing to the Budibase proxy. Requires the AWS ALB Ingress Controller. |
 | couchdb.clusterSize | int | `1` | The number of replicas to run in the CouchDB cluster. We set this to 1 by default to make things simpler, but you can set it to 3 if you need a high-availability CouchDB cluster. |
 | couchdb.couchdbConfig.couchdb.uuid | string | `"budibase-couchdb"` | Unique identifier for this CouchDB server instance. You shouldn't need to change this. |
+| couchdb.extraPorts[0] | object | `{"containerPort":4984,"name":"sqs"}` | Extra ports to expose on the CouchDB service. We expose the SQS port by default, but you can add more ports here if you need to. |
 | couchdb.image | object | `{}` | We use a custom CouchDB image for running Budibase and we don't support using any other CouchDB image. You shouldn't change this, and if you do we can't guarantee that Budibase will work. |
+| couchdb.service.extraPorts[0] | object | `{"name":"sqs","port":4984,"protocol":"TCP","targetPort":4984}` | Extra ports to expose on the CouchDB service. We expose the SQS port by default, but you can add more ports here if you need to. |
 | globals.apiEncryptionKey | string | `""` | Used for encrypting API keys and environment variables when stored in the database. You don't need to set this if `createSecrets` is true. |
 | globals.appVersion | string | `""` | The version of Budibase to deploy. Defaults to what's specified by {{ .Chart.AppVersion }}. Ends up being used as the image version tag for the apps, proxy, and worker images. |
 | globals.automationMaxIterations | string | `"200"` | The maximum number of iterations allows for an automation loop step. You can read more about looping here: <https://docs.budibase.com/docs/looping>. |
@@ -135,6 +137,8 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | globals.smtp.password | string | `""` | The password to use when authenticating with your SMTP server. |
 | globals.smtp.port | string | `"587"` | The port of your SMTP server. |
 | globals.smtp.user | string | `""` | The username to use when authenticating with your SMTP server. |
+| globals.sqs.enabled | bool | `false` | Whether to use the CouchDB "structured query service" or not. This is disabled by default for now, but will become the default in a future release. |
+| globals.tempBucketName | string | `""` |  |
 | globals.tenantFeatureFlags | string | `"*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR"` | Sets what feature flags are enabled and for which tenants. Should not ordinarily need to be changed. |
 | imagePullSecrets | list | `[]` | Passed to all pods created by this chart. Should not ordinarily need to be changed. |
 | ingress.className | string | `""` | What ingress class to use. |
@@ -152,6 +156,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | services.apps.autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization percentage for the apps service. Note that for autoscaling to work, you will need to have metrics-server configured, and resources set for the apps pods. |
 | services.apps.extraContainers | list | `[]` | Additional containers to be added to the apps pod. |
 | services.apps.extraEnv | list | `[]` | Extra environment variables to set for apps pods. Takes a list of name=value pairs. |
+| services.apps.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. |
 | services.apps.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main apps container. |
 | services.apps.extraVolumes | list | `[]` | Additional volumes to the apps pod. |
 | services.apps.httpLogging | int | `1` | Whether or not to log HTTP requests to the apps service. |
@@ -168,6 +173,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | services.automationWorkers.enabled | bool | `true` | Whether or not to enable the automation worker service. If you disable this, automations will be processed by the apps service. |
 | services.automationWorkers.extraContainers | list | `[]` | Additional containers to be added to the automationWorkers pod. |
 | services.automationWorkers.extraEnv | list | `[]` | Extra environment variables to set for automation worker pods. Takes a list of name=value pairs. |
+| services.automationWorkers.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. |
 | services.automationWorkers.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main automationWorkers container. |
 | services.automationWorkers.extraVolumes | list | `[]` | Additional volumes to the automationWorkers pod. |
 | services.automationWorkers.livenessProbe | object | HTTP health checks. | Liveness probe configuration for automation worker pods. You shouldn't need to change this, but if you want to you can find more information here: <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/> |
@@ -195,7 +201,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | services.objectStore.region | string | `""` | AWS_REGION if using S3 |
 | services.objectStore.resources | object | `{}` | The resources to use for Minio pods. See <https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/> for more information on how to set these. |
 | services.objectStore.secretKey | string | `""` | AWS_SECRET_ACCESS_KEY if using S3 |
-| services.objectStore.storage | string | `"100Mi"` | How much storage to give Minio in its PersistentVolumeClaim. |
+| services.objectStore.storage | string | `"2Gi"` | How much storage to give Minio in its PersistentVolumeClaim. |
 | services.objectStore.storageClass | string | `""` | If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. |
 | services.objectStore.url | string | `"http://minio-service:9000"` | URL to use for object storage. Only change this if you're using an external object store, such as S3. Remember to set `minio: false` if you do this. |
 | services.proxy.autoscaling.enabled | bool | `false` | Whether to enable horizontal pod autoscaling for the proxy service. |
@@ -227,6 +233,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
 | services.worker.autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization percentage for the worker service. Note that for autoscaling to work, you will need to have metrics-server configured, and resources set for the worker pods. |
 | services.worker.extraContainers | list | `[]` | Additional containers to be added to the worker pod. |
 | services.worker.extraEnv | list | `[]` | Extra environment variables to set for worker pods. Takes a list of name=value pairs. |
+| services.worker.extraEnvFromSecret | list | `[]` | Name of the K8s Secret in the same namespace which contains the extra environment variables. This can be used to avoid storing sensitive information in the values.yaml file. |
 | services.worker.extraVolumeMounts | list | `[]` | Additional volumeMounts to the main worker container. |
 | services.worker.extraVolumes | list | `[]` | Additional volumes to the worker pod. |
 | services.worker.httpLogging | int | `1` | Whether or not to log HTTP requests to the worker service. |

From ee1b8c9f43bd93c200b31e2962d70aea16525252 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 5 Jun 2024 16:20:05 +0200
Subject: [PATCH 080/128] Add readonly columns to premium

---
 packages/pro                             |  2 +-
 packages/types/src/sdk/licensing/plan.ts | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/pro b/packages/pro
index 0fca4fb090..eab54ba6f5 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 0fca4fb09047df7c36889c5e64f40b2d79d6da47
+Subproject commit eab54ba6f5306ad74625dcc962e34e9b4396784a
diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts
index af682cbad1..4e3d6c76cf 100644
--- a/packages/types/src/sdk/licensing/plan.ts
+++ b/packages/types/src/sdk/licensing/plan.ts
@@ -1,11 +1,5 @@
 export enum PlanType {
   FREE = "free",
-  /** @deprecated */
-  PRO = "pro",
-  /** @deprecated */
-  TEAM = "team",
-  /** @deprecated */
-  PREMIUM = "premium",
   PREMIUM_PLUS = "premium_plus",
   PREMIUM_PLUS_TRIAL = "premium_plus_trial",
   /** @deprecated */
@@ -13,6 +7,13 @@ export enum PlanType {
   ENTERPRISE_BASIC = "enterprise_basic",
   ENTERPRISE_BASIC_TRIAL = "enterprise_basic_trial",
   ENTERPRISE = "enterprise",
+  // Deprecated plans
+  /** @deprecated */
+  PRO = "pro",
+  /** @deprecated */
+  TEAM = "team",
+  /** @deprecated */
+  PREMIUM = "premium",
 }
 
 export enum PriceDuration {

From 7ba37c7db738e5818a5e6b629535beb400f817ad Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 5 Jun 2024 16:54:18 +0200
Subject: [PATCH 081/128] Update ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index eab54ba6f5..85b4fc9ea0 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit eab54ba6f5306ad74625dcc962e34e9b4396784a
+Subproject commit 85b4fc9ea01472bf69840d046733ad596ef893e2

From 098344ca84f8ade1c1d55cf51f55babaeeecc78e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 5 Jun 2024 17:33:48 +0200
Subject: [PATCH 082/128] Undo reorder

---
 packages/types/src/sdk/licensing/plan.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts
index 4e3d6c76cf..af682cbad1 100644
--- a/packages/types/src/sdk/licensing/plan.ts
+++ b/packages/types/src/sdk/licensing/plan.ts
@@ -1,5 +1,11 @@
 export enum PlanType {
   FREE = "free",
+  /** @deprecated */
+  PRO = "pro",
+  /** @deprecated */
+  TEAM = "team",
+  /** @deprecated */
+  PREMIUM = "premium",
   PREMIUM_PLUS = "premium_plus",
   PREMIUM_PLUS_TRIAL = "premium_plus_trial",
   /** @deprecated */
@@ -7,13 +13,6 @@ export enum PlanType {
   ENTERPRISE_BASIC = "enterprise_basic",
   ENTERPRISE_BASIC_TRIAL = "enterprise_basic_trial",
   ENTERPRISE = "enterprise",
-  // Deprecated plans
-  /** @deprecated */
-  PRO = "pro",
-  /** @deprecated */
-  TEAM = "team",
-  /** @deprecated */
-  PREMIUM = "premium",
 }
 
 export enum PriceDuration {

From d3f1180ba8378ebcab972887e9efabaee00e9376 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 5 Jun 2024 15:42:55 +0000
Subject: [PATCH 083/128] Bump version to 2.28.1

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index a43a2b7095..066df19dac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.28.0",
+  "version": "2.28.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 80ddadbe06d7521428b6e63d0229d5d148f36c4e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 5 Jun 2024 16:57:16 +0100
Subject: [PATCH 084/128] Updating app migration to use a slightly different
 mechanism to allow disabling the migration pipeline.

---
 packages/server/src/appMigrations/index.ts      |  6 ++++++
 packages/server/src/appMigrations/migrations.ts | 12 +++++-------
 packages/server/src/middleware/appMigrations.ts |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index 0758b9f324..74e0efe422 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -10,8 +10,14 @@ export * from "./appMigrationMetadata"
 export type AppMigration = {
   id: string
   func: () => Promise<void>
+  // disabled so that by default all migrations listed are enabled
+  disabled?: boolean
 }
 
+// all migrations must be enabled for migrations to run
+export const migrationsEnabled = (): boolean =>
+  MIGRATIONS.find(m => m.disabled) == null
+
 export const getLatestMigrationId = () =>
   MIGRATIONS.map(m => m.id)
     .sort()
diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts
index 48b7f8f0b2..14eb9d0923 100644
--- a/packages/server/src/appMigrations/migrations.ts
+++ b/packages/server/src/appMigrations/migrations.ts
@@ -6,12 +6,10 @@ import { AppMigration } from "."
 import m20240604153647_initial_sqs from "./migrations/20240604153647_initial_sqs"
 
 // Migrations will be executed sorted by ID
-export const MIGRATIONS: AppMigration[] = []
-
-// only run the SQS migration if SQS is enabled
-if (env.SQS_SEARCH_ENABLE) {
-  MIGRATIONS.push({
+export const MIGRATIONS: AppMigration[] = [
+  {
     id: "20240604153647_initial_sqs",
     func: m20240604153647_initial_sqs,
-  })
-}
+    disabled: !env.SQS_SEARCH_ENABLE,
+  },
+]
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index 1fb13094c6..5ec3126fc7 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -1,11 +1,13 @@
 import { UserCtx } from "@budibase/types"
-import { checkMissingMigrations } from "../appMigrations"
+import { checkMissingMigrations, migrationsEnabled } from "../appMigrations"
 import { env } from "@budibase/backend-core"
 
 export default async (ctx: UserCtx, next: any) => {
   const { appId } = ctx
 
-  if (env.SKIP_APP_MIGRATIONS) {
+  // migrations can be disabled via environment variable, or can be disabled
+  // due to some of the migrations not being ready to run - disables all migrations
+  if (env.SKIP_APP_MIGRATIONS || !migrationsEnabled()) {
     return next()
   }
 

From 3cf35881928eea3258e62dfc73d572dde0c2f30e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 5 Jun 2024 17:09:46 +0100
Subject: [PATCH 085/128] Add test for migration disabling.

---
 .../server/src/appMigrations/tests/migrations.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/server/src/appMigrations/tests/migrations.spec.ts b/packages/server/src/appMigrations/tests/migrations.spec.ts
index 7af2346934..9f924aa2c5 100644
--- a/packages/server/src/appMigrations/tests/migrations.spec.ts
+++ b/packages/server/src/appMigrations/tests/migrations.spec.ts
@@ -1,6 +1,7 @@
 import { Header } from "@budibase/backend-core"
 import * as setup from "../../api/routes/tests/utilities"
 import * as migrations from "../migrations"
+import { migrationsEnabled } from "../index"
 import { getAppMigrationVersion } from "../appMigrationMetadata"
 
 jest.mock<typeof migrations>("../migrations", () => ({
@@ -52,4 +53,14 @@ describe("migrations", () => {
       },
     })
   })
+
+  it("should disable migrations if any migration is disabled", () => {
+    migrations.MIGRATIONS.push({
+      id: "20231211105814_new-test",
+      func: async () => {},
+      disabled: true,
+    })
+
+    expect(migrationsEnabled()).toBe(false)
+  })
 })

From 0a5a7884403bafe545f839ae82906973dde55084 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 5 Jun 2024 18:19:44 +0100
Subject: [PATCH 086/128] Updating migrations to disable all migrations after
 the first disabled migration.

---
 .../server/src/api/controllers/application.ts |  2 +-
 .../server/src/api/controllers/migrations.ts  |  4 ++--
 .../src/api/controllers/static/index.ts       |  4 ++--
 packages/server/src/appMigrations/index.ts    | 24 ++++++++++++-------
 .../appMigrations/tests/migrations.spec.ts    | 18 +++++++++++---
 .../server/src/middleware/appMigrations.ts    |  4 ++--
 6 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index e73058239b..1555dc8afd 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -361,7 +361,7 @@ async function performAppCreate(ctx: UserCtx<CreateAppRequest, App>) {
     // Initialise the app migration version as the latest one
     await appMigrations.updateAppMigrationMetadata({
       appId,
-      version: appMigrations.getLatestMigrationId(),
+      version: appMigrations.getLatestEnabledMigrationId(),
     })
 
     await cache.app.invalidateAppMetadata(appId, newApplication)
diff --git a/packages/server/src/api/controllers/migrations.ts b/packages/server/src/api/controllers/migrations.ts
index c8f786578d..9a23226837 100644
--- a/packages/server/src/api/controllers/migrations.ts
+++ b/packages/server/src/api/controllers/migrations.ts
@@ -3,7 +3,7 @@ import { migrate as migrationImpl, MIGRATIONS } from "../../migrations"
 import { Ctx } from "@budibase/types"
 import {
   getAppMigrationVersion,
-  getLatestMigrationId,
+  getLatestEnabledMigrationId,
 } from "../../appMigrations"
 
 export async function migrate(ctx: Ctx) {
@@ -27,7 +27,7 @@ export async function getMigrationStatus(ctx: Ctx) {
 
   const latestAppliedMigration = await getAppMigrationVersion(appId)
 
-  const migrated = latestAppliedMigration === getLatestMigrationId()
+  const migrated = latestAppliedMigration === getLatestEnabledMigrationId()
 
   ctx.body = { migrated }
   ctx.status = 200
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 63240c8ecb..8db7816a9c 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -31,7 +31,7 @@ import {
 } from "@budibase/types"
 import {
   getAppMigrationVersion,
-  getLatestMigrationId,
+  getLatestEnabledMigrationId,
 } from "../../../appMigrations"
 
 import send from "koa-send"
@@ -133,7 +133,7 @@ const requiresMigration = async (ctx: Ctx) => {
     ctx.throw("AppId could not be found")
   }
 
-  const latestMigration = getLatestMigrationId()
+  const latestMigration = getLatestEnabledMigrationId()
   if (!latestMigration) {
     return false
   }
diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index 74e0efe422..a3e3858559 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -14,16 +14,24 @@ export type AppMigration = {
   disabled?: boolean
 }
 
-// all migrations must be enabled for migrations to run
-export const migrationsEnabled = (): boolean =>
-  MIGRATIONS.find(m => m.disabled) == null
-
-export const getLatestMigrationId = () =>
-  MIGRATIONS.map(m => m.id)
+export function getLatestEnabledMigrationId() {
+  const enabledMigrations: AppMigration[] = []
+  for (let migration of MIGRATIONS) {
+    // if a migration is disabled, all migrations after it are disabled
+    if (migration.disabled) {
+      break
+    }
+    enabledMigrations.push(migration)
+  }
+  return enabledMigrations
+    .map(m => m.id)
     .sort()
     .reverse()[0]
+}
 
-const getTimestamp = (versionId: string) => versionId?.split("_")[0] || ""
+function getTimestamp(versionId: string) {
+  return versionId?.split("_")[0] || ""
+}
 
 export async function checkMissingMigrations(
   ctx: UserCtx,
@@ -31,7 +39,7 @@ export async function checkMissingMigrations(
   appId: string
 ) {
   const currentVersion = await getAppMigrationVersion(appId)
-  const latestMigration = getLatestMigrationId()
+  const latestMigration = getLatestEnabledMigrationId()
 
   if (getTimestamp(currentVersion) < getTimestamp(latestMigration)) {
     await queue.add(
diff --git a/packages/server/src/appMigrations/tests/migrations.spec.ts b/packages/server/src/appMigrations/tests/migrations.spec.ts
index 9f924aa2c5..1ea54396f7 100644
--- a/packages/server/src/appMigrations/tests/migrations.spec.ts
+++ b/packages/server/src/appMigrations/tests/migrations.spec.ts
@@ -1,7 +1,7 @@
 import { Header } from "@budibase/backend-core"
 import * as setup from "../../api/routes/tests/utilities"
 import * as migrations from "../migrations"
-import { migrationsEnabled } from "../index"
+import { getLatestEnabledMigrationId } from "../index"
 import { getAppMigrationVersion } from "../appMigrationMetadata"
 
 jest.mock<typeof migrations>("../migrations", () => ({
@@ -55,12 +55,24 @@ describe("migrations", () => {
   })
 
   it("should disable migrations if any migration is disabled", () => {
+    // remove all migrations
+    migrations.MIGRATIONS.splice(0, migrations.MIGRATIONS.length)
+    migrations.MIGRATIONS.push({
+      id: "20231211105810_new-test",
+      func: async () => {},
+    })
+    migrations.MIGRATIONS.push({
+      id: "20231211105812_new-test",
+      func: async () => {},
+    })
     migrations.MIGRATIONS.push({
       id: "20231211105814_new-test",
       func: async () => {},
-      disabled: true,
     })
 
-    expect(migrationsEnabled()).toBe(false)
+    expect(getLatestEnabledMigrationId()).toBe("20231211105814_new-test")
+
+    migrations.MIGRATIONS[1].disabled = true
+    expect(getLatestEnabledMigrationId()).toBe("20231211105810_new-test")
   })
 })
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index 5ec3126fc7..a8ea886ab2 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -1,5 +1,5 @@
 import { UserCtx } from "@budibase/types"
-import { checkMissingMigrations, migrationsEnabled } from "../appMigrations"
+import { checkMissingMigrations } from "../appMigrations"
 import { env } from "@budibase/backend-core"
 
 export default async (ctx: UserCtx, next: any) => {
@@ -7,7 +7,7 @@ export default async (ctx: UserCtx, next: any) => {
 
   // migrations can be disabled via environment variable, or can be disabled
   // due to some of the migrations not being ready to run - disables all migrations
-  if (env.SKIP_APP_MIGRATIONS || !migrationsEnabled()) {
+  if (env.SKIP_APP_MIGRATIONS) {
     return next()
   }
 

From c57a81c6de3601e1642cca62f43c4080be4c344d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 11:53:58 +0100
Subject: [PATCH 087/128] Adding a global binding for globalId which is
 retrieved as part of the self call - making sure this is available as a
 binding (this is not in the user metadata table, just for bindings).

---
 packages/builder/src/dataBinding.js         | 4 ++++
 packages/server/src/api/controllers/auth.ts | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 64257e7a7b..6defe94108 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -30,6 +30,7 @@ import ActionDefinitions from "components/design/settings/controls/ButtonActionE
 import { environment, licensing } from "stores/portal"
 import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils"
 import { FIELDS } from "constants/backend"
+import { FieldType } from "@budibase/types"
 
 const { ContextScopes } = Constants
 
@@ -555,6 +556,9 @@ const getComponentBindingCategory = (component, context, def) => {
 export const getUserBindings = () => {
   let bindings = []
   const { schema } = getSchemaForDatasourcePlus(TableNames.USERS)
+  // add props that are not in the user metadata table schema
+  // but will be there for logged-in user
+  schema["globalId"] = { type: FieldType.STRING }
   const keys = Object.keys(schema).sort()
   const safeUser = makePropSafe("user")
 
diff --git a/packages/server/src/api/controllers/auth.ts b/packages/server/src/api/controllers/auth.ts
index 9b1b78ed9e..4ff592534d 100644
--- a/packages/server/src/api/controllers/auth.ts
+++ b/packages/server/src/api/controllers/auth.ts
@@ -1,7 +1,7 @@
 import { outputProcessing } from "../../utilities/rowProcessor"
 import { InternalTables } from "../../db/utils"
 import { getFullUser } from "../../utilities/users"
-import { roles, context } from "@budibase/backend-core"
+import { roles, context, db as dbCore } from "@budibase/backend-core"
 import { ContextUser, Row, UserCtx } from "@budibase/types"
 import sdk from "../../sdk"
 import { processUser } from "../../utilities/global"
@@ -27,6 +27,8 @@ export async function fetchSelf(ctx: UserCtx) {
 
   const appId = context.getAppId()
   let user: ContextUser = await getFullUser(userId)
+  // add globalId of user
+  user.globalId = dbCore.getGlobalIDFromUserMetadataID(userId)
   // this shouldn't be returned by the app self
   delete user.roles
   // forward the csrf token from the session

From f09b6bf090580e438126a7ac9496aff3a4aa4ec9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 6 Jun 2024 13:03:00 +0200
Subject: [PATCH 088/128] Handle times properly on time only settings for
 timestamps

---
 .../app/blocks/FormBlockComponent.svelte      |  5 ++++
 .../components/app/forms/DateTimeField.svelte | 28 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/app/blocks/FormBlockComponent.svelte b/packages/client/src/components/app/blocks/FormBlockComponent.svelte
index 396dfcf808..58632ad1bc 100644
--- a/packages/client/src/components/app/blocks/FormBlockComponent.svelte
+++ b/packages/client/src/components/app/blocks/FormBlockComponent.svelte
@@ -68,6 +68,11 @@
           maximum: schema?.constraints?.length?.maximum,
         }
       },
+      [FieldType.DATETIME]: (_field, schema) => {
+        return {
+          valueAsTimestamp: !schema?.timeOnly,
+        }
+      },
     }
 
     const fieldSchema = getFieldSchema(field)
diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte
index 499f0443cb..7b6ed734fe 100644
--- a/packages/client/src/components/app/forms/DateTimeField.svelte
+++ b/packages/client/src/components/app/forms/DateTimeField.svelte
@@ -16,15 +16,37 @@
   export let onChange
   export let span
   export let helpText = null
+  export let valueAsTimestamp = false
 
   let fieldState
   let fieldApi
 
   const handleChange = e => {
-    const changed = fieldApi.setValue(e.detail)
-    if (onChange && changed) {
-      onChange({ value: e.detail })
+    let value = e.detail
+    if (timeOnly && valueAsTimestamp) {
+      if (!isValidDate(value)) {
+        // Handle time only fields that are timestamps under the hood
+        value = timeToDateISOString(value)
+      }
     }
+
+    const changed = fieldApi.setValue(value)
+    if (onChange && changed) {
+      onChange({ value })
+    }
+  }
+
+  const isValidDate = value => !isNaN(new Date(value))
+
+  const timeToDateISOString = value => {
+    let [hours, minutes] = value.split(":").map(Number)
+
+    const date = new Date()
+    date.setHours(hours)
+    date.setMinutes(minutes)
+    date.setSeconds(0)
+    date.setMilliseconds(0)
+    return date.toISOString()
   }
 </script>
 

From 9ad1d60850f0b7bc368c33b9a3c9df9fcecb6b04 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 6 Jun 2024 13:25:13 +0200
Subject: [PATCH 089/128] Handle dateonly by default

---
 .../src/components/app/blocks/FormBlockComponent.svelte     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/blocks/FormBlockComponent.svelte b/packages/client/src/components/app/blocks/FormBlockComponent.svelte
index 58632ad1bc..f931319118 100644
--- a/packages/client/src/components/app/blocks/FormBlockComponent.svelte
+++ b/packages/client/src/components/app/blocks/FormBlockComponent.svelte
@@ -69,9 +69,13 @@
         }
       },
       [FieldType.DATETIME]: (_field, schema) => {
-        return {
+        const props = {
           valueAsTimestamp: !schema?.timeOnly,
         }
+        if (schema?.dateOnly) {
+          props.enableTime = false
+        }
+        return props
       },
     }
 

From 878114133c399812d22bd6abb0f44bd796618c2d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 12:36:57 +0100
Subject: [PATCH 090/128] Adding test.

---
 .../server/src/api/routes/tests/auth.spec.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/auth.spec.js b/packages/server/src/api/routes/tests/auth.spec.js
index 5fbead99b7..64952db17c 100644
--- a/packages/server/src/api/routes/tests/auth.spec.js
+++ b/packages/server/src/api/routes/tests/auth.spec.js
@@ -1,5 +1,8 @@
 const setup = require("./utilities")
-const { generateUserMetadataID } = require("../../../db/utils")
+const {
+  generateUserMetadataID,
+  getGlobalIDFromUserMetadataID,
+} = require("../../../db/utils")
 
 describe("/authenticate", () => {
   let request = setup.getRequest()
@@ -20,5 +23,16 @@ describe("/authenticate", () => {
         .expect(200)
       expect(res.body._id).toEqual(generateUserMetadataID(config.user._id))
     })
+
+    it("should container the global user ID", async () => {
+      const res = await request
+        .get(`/api/self`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      expect(res.body.globalId).toEqual(
+        getGlobalIDFromUserMetadataID(config.user._id)
+      )
+    })
   })
 })

From de0a3f5b0d297f4b5f0a5b04abffb1ece4a07f24 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 6 Jun 2024 12:15:05 +0000
Subject: [PATCH 091/128] Bump version to 2.28.2

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 066df19dac..1cd6b251a8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.28.1",
+  "version": "2.28.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 944689b17d83f5b8e362c91b5b5f44213df829a4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 6 Jun 2024 13:14:18 +0000
Subject: [PATCH 092/128] Bump version to 2.28.3

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 1cd6b251a8..8b1fa18d23 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.28.2",
+  "version": "2.28.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From a0727e2c2a74f2083996d418cbefc2b1a8eb3cba Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 6 Jun 2024 15:39:05 +0200
Subject: [PATCH 093/128] Remove wrong scope

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 08176fae90..5377dfc5a1 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
     "build:apps": "yarn build --scope @budibase/server --scope @budibase/worker",
     "build:cli": "yarn build --scope @budibase/cli",
-    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
-    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
+    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
+    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run --concurrency 2 check:types",
     "build:sdk": "lerna run --stream build:sdk",

From ac53a97176bc43cbd63e05a8a7efc3d755247abd Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 6 Jun 2024 14:55:07 +0100
Subject: [PATCH 094/128] WIP

---
 packages/backend-core/src/db/couch/DatabaseImpl.ts       | 2 ++
 packages/server/src/api/routes/tests/application.spec.ts | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 8194d1aabf..b3b51bf72e 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -360,6 +360,8 @@ export class DatabaseImpl implements Database {
             SQLITE_DESIGN_DOC_ID
           )
           await this.remove(SQLITE_DESIGN_DOC_ID, definition._rev)
+        } catch (err: any) {
+          // design document doesn't exist, don't worry
         } finally {
           await this.sqlDiskCleanup()
         }
diff --git a/packages/server/src/api/routes/tests/application.spec.ts b/packages/server/src/api/routes/tests/application.spec.ts
index 7f89a5cac2..b571e6e1f7 100644
--- a/packages/server/src/api/routes/tests/application.spec.ts
+++ b/packages/server/src/api/routes/tests/application.spec.ts
@@ -331,9 +331,15 @@ describe("/applications", () => {
 
     it("should delete published app and dev app with prod app ID", async () => {
       await config.api.application.delete(app.appId.replace("_dev", ""))
-      expect(events.app.deleted).toHaveBeenCalledTimes(1)
+      expect(events.app.deleted).toHaveBeenCalledTmes(1)
       expect(events.app.unpublished).toHaveBeenCalledTimes(1)
     })
+
+    it.only("should be able to delete an app after SQS_SEARCH_ENABLE has been set but app hasn't been migrated", async () => {
+      await config.withCoreEnv({ SQS_SEARCH_ENABLE: "true" }, async () => {
+        await config.api.application.delete(app.appId)
+      })
+    })
   })
 
   describe("POST /api/applications/:appId/duplicate", () => {

From f0f8c14216156fcadec02b43e29cafeda01a7f78 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 14:58:03 +0100
Subject: [PATCH 095/128] Fixing an issue introduced here which caused template
 test to fail.

---
 packages/server/src/sdk/app/tables/internal/sqs.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts
index b0c6f28be7..52a0cfbda0 100644
--- a/packages/server/src/sdk/app/tables/internal/sqs.ts
+++ b/packages/server/src/sdk/app/tables/internal/sqs.ts
@@ -108,16 +108,15 @@ async function buildBaseDefinition(): Promise<PreSaveSQLiteDefinition> {
 export async function syncDefinition(): Promise<void> {
   const db = context.getAppDB()
   let rev: string | undefined
-  try {
+  if (await db.exists(SQLITE_DESIGN_DOC_ID)) {
     const existing = await db.get(SQLITE_DESIGN_DOC_ID)
     rev = existing._rev
-  } finally {
-    const definition = await buildBaseDefinition()
-    if (rev) {
-      definition._rev = rev
-    }
-    await db.put(definition)
   }
+  const definition = await buildBaseDefinition()
+  if (rev) {
+    definition._rev = rev
+  }
+  await db.put(definition)
 }
 
 export async function addTable(table: Table) {

From 2c86ea14fd5989a0791a5c6866d40619f0071a7b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 15:07:06 +0100
Subject: [PATCH 096/128] Changing how disk cleanup is performed.

---
 .../backend-core/src/db/couch/DatabaseImpl.ts | 21 +++++++------------
 .../src/api/routes/tests/application.spec.ts  |  4 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index b3b51bf72e..2b589ed09a 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -352,20 +352,15 @@ export class DatabaseImpl implements Database {
   }
 
   async destroy() {
+    if (env.SQS_SEARCH_ENABLE && (await this.exists(SQLITE_DESIGN_DOC_ID))) {
+      // delete the design document, then run the cleanup operation
+      const definition = await this.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
+      // remove all tables - save the definition then trigger a cleanup
+      definition.sql.tables = {}
+      await this.put(definition)
+      await this.sqlDiskCleanup()
+    }
     try {
-      if (env.SQS_SEARCH_ENABLE) {
-        // delete the design document, then run the cleanup operation
-        try {
-          const definition = await this.get<SQLiteDefinition>(
-            SQLITE_DESIGN_DOC_ID
-          )
-          await this.remove(SQLITE_DESIGN_DOC_ID, definition._rev)
-        } catch (err: any) {
-          // design document doesn't exist, don't worry
-        } finally {
-          await this.sqlDiskCleanup()
-        }
-      }
       return await this.nano().db.destroy(this.name)
     } catch (err: any) {
       // didn't exist, don't worry
diff --git a/packages/server/src/api/routes/tests/application.spec.ts b/packages/server/src/api/routes/tests/application.spec.ts
index b571e6e1f7..13b7451a7e 100644
--- a/packages/server/src/api/routes/tests/application.spec.ts
+++ b/packages/server/src/api/routes/tests/application.spec.ts
@@ -331,11 +331,11 @@ describe("/applications", () => {
 
     it("should delete published app and dev app with prod app ID", async () => {
       await config.api.application.delete(app.appId.replace("_dev", ""))
-      expect(events.app.deleted).toHaveBeenCalledTmes(1)
+      expect(events.app.deleted).toHaveBeenCalledTimes(1)
       expect(events.app.unpublished).toHaveBeenCalledTimes(1)
     })
 
-    it.only("should be able to delete an app after SQS_SEARCH_ENABLE has been set but app hasn't been migrated", async () => {
+    it("should be able to delete an app after SQS_SEARCH_ENABLE has been set but app hasn't been migrated", async () => {
       await config.withCoreEnv({ SQS_SEARCH_ENABLE: "true" }, async () => {
         await config.api.application.delete(app.appId)
       })

From 3c4cf69463b2460660b7ff6f63523c1b5ae0e39d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 15:14:59 +0100
Subject: [PATCH 097/128] Updating migration integrity test to allow certain
 properties to change.

---
 .../tests/migrations.integrity.spec.ts        | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts b/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
index 145a06d7f5..2de27ef9d4 100644
--- a/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
+++ b/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
@@ -2,6 +2,23 @@ import { context } from "@budibase/backend-core"
 import * as setup from "../../api/routes/tests/utilities"
 import * as migrations from "../migrations"
 
+function removeChangeableKeys(documents: Document[]) {
+  const changeableKeys = ["createdAt", "updatedAt", "_rev", "rev"]
+  function iterate(obj: Record<string, any>) {
+    for (let key of Object.keys(obj)) {
+      if (typeof obj[key] === "object") {
+        iterate(obj[key])
+      } else if (changeableKeys.indexOf(key) !== -1) {
+        delete obj[key]
+      }
+    }
+  }
+  for (let doc of documents) {
+    iterate(doc)
+  }
+  return documents
+}
+
 describe("migration integrity", () => {
   // These test is checking that each migration is "idempotent".
   // We should be able to rerun any migration, with any rerun not modifiying anything. The code should be aware that the migration already ran
@@ -13,12 +30,18 @@ describe("migration integrity", () => {
       const db = context.getAppDB()
       for (const migration of migrations.MIGRATIONS) {
         await migration.func()
-        const docs = await db.allDocs({ include_docs: true })
+        const preResp = await db.allDocs({ include_docs: true })
 
         await migration.func()
-        const latestDocs = await db.allDocs({ include_docs: true })
+        const postResp = await db.allDocs({ include_docs: true })
 
-        expect(docs).toEqual(latestDocs)
+        const preDocs = removeChangeableKeys(
+          preResp.rows.map(row => row.doc as Document)
+        )
+        const postDocs = removeChangeableKeys(
+          postResp.rows.map(row => row.doc as Document)
+        )
+        expect(preDocs).toEqual(postDocs)
       }
     })
   })

From 244fbe42b145666897e3a7db59b91b61ba3bc4b0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 16:04:23 +0100
Subject: [PATCH 098/128] Updating migration to check if the SQL definitions
 have changed, if they haven't don't write them again.

---
 .../tests/migrations.integrity.spec.ts        | 29 ++-----------------
 .../server/src/sdk/app/tables/internal/sqs.ts | 15 ++++++----
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts b/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
index 2de27ef9d4..145a06d7f5 100644
--- a/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
+++ b/packages/server/src/appMigrations/tests/migrations.integrity.spec.ts
@@ -2,23 +2,6 @@ import { context } from "@budibase/backend-core"
 import * as setup from "../../api/routes/tests/utilities"
 import * as migrations from "../migrations"
 
-function removeChangeableKeys(documents: Document[]) {
-  const changeableKeys = ["createdAt", "updatedAt", "_rev", "rev"]
-  function iterate(obj: Record<string, any>) {
-    for (let key of Object.keys(obj)) {
-      if (typeof obj[key] === "object") {
-        iterate(obj[key])
-      } else if (changeableKeys.indexOf(key) !== -1) {
-        delete obj[key]
-      }
-    }
-  }
-  for (let doc of documents) {
-    iterate(doc)
-  }
-  return documents
-}
-
 describe("migration integrity", () => {
   // These test is checking that each migration is "idempotent".
   // We should be able to rerun any migration, with any rerun not modifiying anything. The code should be aware that the migration already ran
@@ -30,18 +13,12 @@ describe("migration integrity", () => {
       const db = context.getAppDB()
       for (const migration of migrations.MIGRATIONS) {
         await migration.func()
-        const preResp = await db.allDocs({ include_docs: true })
+        const docs = await db.allDocs({ include_docs: true })
 
         await migration.func()
-        const postResp = await db.allDocs({ include_docs: true })
+        const latestDocs = await db.allDocs({ include_docs: true })
 
-        const preDocs = removeChangeableKeys(
-          preResp.rows.map(row => row.doc as Document)
-        )
-        const postDocs = removeChangeableKeys(
-          postResp.rows.map(row => row.doc as Document)
-        )
-        expect(preDocs).toEqual(postDocs)
+        expect(docs).toEqual(latestDocs)
       }
     })
   })
diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts
index 52a0cfbda0..6e0e6e7496 100644
--- a/packages/server/src/sdk/app/tables/internal/sqs.ts
+++ b/packages/server/src/sdk/app/tables/internal/sqs.ts
@@ -14,6 +14,7 @@ import {
   CONSTANT_INTERNAL_ROW_COLS,
   generateJunctionTableID,
 } from "../../../../db/utils"
+import { isEqual } from "lodash"
 
 const FieldTypeMap: Record<FieldType, SQLiteType> = {
   [FieldType.BOOLEAN]: SQLiteType.NUMERIC,
@@ -107,16 +108,18 @@ async function buildBaseDefinition(): Promise<PreSaveSQLiteDefinition> {
 
 export async function syncDefinition(): Promise<void> {
   const db = context.getAppDB()
-  let rev: string | undefined
+  let existing: SQLiteDefinition | undefined
   if (await db.exists(SQLITE_DESIGN_DOC_ID)) {
-    const existing = await db.get(SQLITE_DESIGN_DOC_ID)
-    rev = existing._rev
+    existing = await db.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
   }
   const definition = await buildBaseDefinition()
-  if (rev) {
-    definition._rev = rev
+  if (existing) {
+    definition._rev = existing._rev
+  }
+  // only write if something has changed
+  if (!existing || !isEqual(existing.sql, definition.sql)) {
+    await db.put(definition)
   }
-  await db.put(definition)
 }
 
 export async function addTable(table: Table) {

From 243ccee6452b5b281d710524b5dfbb81ad0ed9f1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 16:10:58 +0100
Subject: [PATCH 099/128] Enables SQS in dev!

---
 packages/server/scripts/dev/manage.js | 1 +
 packages/worker/scripts/dev/manage.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 509e9a05ac..3630aeee75 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -48,6 +48,7 @@ async function init() {
     HTTP_LOGGING: "0",
     VERSION: "0.0.0+local",
     PASSWORD_MIN_LENGTH: "1",
+    SQS_SEARCH_ENABLE: "1",
   }
 
   config = { ...config, ...existingConfig }
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index acab87eb5e..e120b93881 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -31,6 +31,7 @@ async function init() {
     HTTP_LOGGING: "0",
     VERSION: "0.0.0+local",
     PASSWORD_MIN_LENGTH: "1",
+    SQS_SEARCH_ENABLE: "1",
   }
 
   config = { ...config, ...existingConfig }

From 70aa43680d3115ddbc1b7d0cc2511146b6074953 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 16:49:03 +0100
Subject: [PATCH 100/128] Addressing PR comments.

---
 packages/backend-core/src/environment.ts      |  1 -
 .../server/src/api/controllers/migrations.ts  |  2 +-
 packages/server/src/appMigrations/index.ts    |  4 +-
 .../migrations/20240604153647_initial_sqs.ts  | 10 +----
 .../appMigrations/tests/migrations.spec.ts    | 43 ++++++++++---------
 .../server/src/middleware/appMigrations.ts    |  4 +-
 .../server/src/sdk/app/tables/internal/sqs.ts |  6 ++-
 7 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 14b04ae9f8..1e7da2f9a2 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -193,7 +193,6 @@ const environment = {
   },
   ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M",
   DISABLE_SCIM_CALLS: process.env.DISABLE_SCIM_CALLS,
-  SKIP_APP_MIGRATIONS: process.env.SKIP_APP_MIGRATIONS || false,
 }
 
 // clean up any environment variable edge cases
diff --git a/packages/server/src/api/controllers/migrations.ts b/packages/server/src/api/controllers/migrations.ts
index 9a23226837..97c0ae8712 100644
--- a/packages/server/src/api/controllers/migrations.ts
+++ b/packages/server/src/api/controllers/migrations.ts
@@ -27,7 +27,7 @@ export async function getMigrationStatus(ctx: Ctx) {
 
   const latestAppliedMigration = await getAppMigrationVersion(appId)
 
-  const migrated = latestAppliedMigration === getLatestEnabledMigrationId()
+  const migrated = latestAppliedMigration >= getLatestEnabledMigrationId()
 
   ctx.body = { migrated }
   ctx.status = 200
diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index a3e3858559..cac1e82716 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -14,9 +14,9 @@ export type AppMigration = {
   disabled?: boolean
 }
 
-export function getLatestEnabledMigrationId() {
+export function getLatestEnabledMigrationId(migrations?: AppMigration[]) {
   const enabledMigrations: AppMigration[] = []
-  for (let migration of MIGRATIONS) {
+  for (let migration of migrations || MIGRATIONS) {
     // if a migration is disabled, all migrations after it are disabled
     if (migration.disabled) {
       break
diff --git a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
index d092f416ff..05174b8cf1 100644
--- a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
+++ b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
@@ -43,15 +43,7 @@ const migration = async () => {
     const tables = await sdk.tables.getAllInternalTables()
     // do these one by one - running in parallel could cause problems
     for (let table of tables) {
-      try {
-        await db.sql(`select * from ${table._id} limit 1`)
-      } catch (err) {
-        if (typeof err === "object") {
-          const dbErr = err as DBError
-          throw new Error(`Failed to run initial SQS search - ${dbErr.message}`)
-        }
-        throw err
-      }
+      await db.sql(`select * from ${table._id} limit 1`)
     }
   }
 }
diff --git a/packages/server/src/appMigrations/tests/migrations.spec.ts b/packages/server/src/appMigrations/tests/migrations.spec.ts
index 1ea54396f7..1da94f503f 100644
--- a/packages/server/src/appMigrations/tests/migrations.spec.ts
+++ b/packages/server/src/appMigrations/tests/migrations.spec.ts
@@ -1,7 +1,7 @@
 import { Header } from "@budibase/backend-core"
 import * as setup from "../../api/routes/tests/utilities"
 import * as migrations from "../migrations"
-import { getLatestEnabledMigrationId } from "../index"
+import { AppMigration, getLatestEnabledMigrationId } from "../index"
 import { getAppMigrationVersion } from "../appMigrationMetadata"
 
 jest.mock<typeof migrations>("../migrations", () => ({
@@ -54,25 +54,28 @@ describe("migrations", () => {
     })
   })
 
-  it("should disable migrations if any migration is disabled", () => {
-    // remove all migrations
-    migrations.MIGRATIONS.splice(0, migrations.MIGRATIONS.length)
-    migrations.MIGRATIONS.push({
-      id: "20231211105810_new-test",
-      func: async () => {},
-    })
-    migrations.MIGRATIONS.push({
-      id: "20231211105812_new-test",
-      func: async () => {},
-    })
-    migrations.MIGRATIONS.push({
-      id: "20231211105814_new-test",
-      func: async () => {},
-    })
+  it("should disable all migrations after one that is disabled", () => {
+    const MIGRATION_ID1 = "20231211105810_new-test",
+      MIGRATION_ID2 = "20231211105812_new-test",
+      MIGRATION_ID3 = "20231211105814_new-test"
+    // create some migrations to test with
+    const migrations: AppMigration[] = [
+      {
+        id: MIGRATION_ID1,
+        func: async () => {},
+      },
+      {
+        id: MIGRATION_ID2,
+        func: async () => {},
+      },
+      {
+        id: MIGRATION_ID3,
+        func: async () => {},
+      },
+    ]
 
-    expect(getLatestEnabledMigrationId()).toBe("20231211105814_new-test")
-
-    migrations.MIGRATIONS[1].disabled = true
-    expect(getLatestEnabledMigrationId()).toBe("20231211105810_new-test")
+    expect(getLatestEnabledMigrationId(migrations)).toBe(MIGRATION_ID3)
+    migrations[1].disabled = true
+    expect(getLatestEnabledMigrationId(migrations)).toBe(MIGRATION_ID1)
   })
 })
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index a8ea886ab2..fdaeb3a03d 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -5,8 +5,8 @@ import { env } from "@budibase/backend-core"
 export default async (ctx: UserCtx, next: any) => {
   const { appId } = ctx
 
-  // migrations can be disabled via environment variable, or can be disabled
-  // due to some of the migrations not being ready to run - disables all migrations
+  // migrations can be disabled via environment variable if you
+  // need to completely disable migrations, e.g. for testing
   if (env.SKIP_APP_MIGRATIONS) {
     return next()
   }
diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts
index 6e0e6e7496..4819b9d8d5 100644
--- a/packages/server/src/sdk/app/tables/internal/sqs.ts
+++ b/packages/server/src/sdk/app/tables/internal/sqs.ts
@@ -109,8 +109,12 @@ async function buildBaseDefinition(): Promise<PreSaveSQLiteDefinition> {
 export async function syncDefinition(): Promise<void> {
   const db = context.getAppDB()
   let existing: SQLiteDefinition | undefined
-  if (await db.exists(SQLITE_DESIGN_DOC_ID)) {
+  try {
     existing = await db.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
+  } catch (err: any) {
+    if (err.status !== 404) {
+      throw err
+    }
   }
   const definition = await buildBaseDefinition()
   if (existing) {

From 1124ee1cc8adbc6111ccbbe625101b794ca14f3c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 17:20:25 +0100
Subject: [PATCH 101/128] Adding a test case for the new migration.

---
 .../migrations/20240604153647_initial_sqs.ts  |   8 +-
 .../tests/20240604153647_initial_sqs.spec.ts  | 116 ++++++++++++++++++
 packages/server/src/environment.ts            |   1 +
 .../server/src/middleware/appMigrations.ts    |   4 +-
 4 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts

diff --git a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
index 05174b8cf1..6ad3c09c3c 100644
--- a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
+++ b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
@@ -17,15 +17,17 @@ const migration = async () => {
 
     // it already has the junction table ID - no need to migrate
     if (!linkDoc.tableId) {
-      linkDoc.tableId = new LinkDocumentImpl(
+      const newLink = new LinkDocumentImpl(
         linkDoc.doc1.tableId,
         linkDoc.doc1.fieldName,
         linkDoc.doc1.rowId,
         linkDoc.doc2.tableId,
         linkDoc.doc2.fieldName,
         linkDoc.doc2.rowId
-      ).tableId
-      docsToUpdate.push(linkDoc)
+      )
+      newLink._id = linkDoc._id!
+      newLink._rev = linkDoc._rev
+      docsToUpdate.push(newLink)
     }
   }
 
diff --git a/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts
new file mode 100644
index 0000000000..64420d239f
--- /dev/null
+++ b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts
@@ -0,0 +1,116 @@
+import * as setup from "../../../api/routes/tests/utilities"
+import { basicTable } from "../../../tests/utilities/structures"
+import {
+  db as dbCore,
+  SQLITE_DESIGN_DOC_ID,
+  context,
+} from "@budibase/backend-core"
+import {
+  LinkDocument,
+  DocumentType,
+  SQLiteDefinition,
+  SQLiteType,
+} from "@budibase/types"
+import {
+  generateJunctionTableID,
+  generateLinkID,
+  generateRowID,
+} from "../../../db/utils"
+import migration from "../20240604153647_initial_sqs"
+
+const config = setup.getConfig()
+let tableId: string
+
+function oldLinkDocInfo() {
+  const tableId1 = `${DocumentType.TABLE}_a`,
+    tableId2 = `${DocumentType.TABLE}_b`
+  return {
+    tableId1,
+    tableId2,
+    rowId1: generateRowID(tableId1, "b"),
+    rowId2: generateRowID(tableId2, "a"),
+    col1: "columnB",
+    col2: "columnA",
+  }
+}
+
+function oldLinkDocID() {
+  const { tableId1, tableId2, rowId1, rowId2, col1, col2 } = oldLinkDocInfo()
+  return generateLinkID(tableId1, tableId2, rowId1, rowId2, col1, col2)
+}
+
+function oldLinkDocument(): Omit<LinkDocument, "tableId"> {
+  const { tableId1, tableId2, rowId1, rowId2, col1, col2 } = oldLinkDocInfo()
+  return {
+    type: "link",
+    _id: oldLinkDocID(),
+    doc1: {
+      tableId: tableId1,
+      fieldName: col1,
+      rowId: rowId1,
+    },
+    doc2: {
+      tableId: tableId2,
+      fieldName: col2,
+      rowId: rowId2,
+    },
+  }
+}
+
+async function sqsDisabled(cb: () => Promise<void>) {
+  await config.withEnv({ SQS_SEARCH_ENABLE: "" }, cb)
+}
+
+async function sqsEnabled(cb: () => Promise<void>) {
+  await config.withEnv({ SQS_SEARCH_ENABLE: "1" }, cb)
+}
+
+beforeAll(async () => {
+  await sqsDisabled(async () => {
+    await config.init()
+    const table = await config.api.table.save(basicTable())
+    tableId = table._id!
+    const db = dbCore.getDB(config.appId!)
+    // old link document
+    await db.put(oldLinkDocument())
+  })
+})
+
+describe("SQS migration", () => {
+  it("test migration runs as expected against an older DB", async () => {
+    const db = dbCore.getDB(config.appId!)
+    // confirm nothing exists initially
+    await sqsDisabled(async () => {
+      let error: any | undefined
+      try {
+        await db.get(SQLITE_DESIGN_DOC_ID)
+      } catch (err: any) {
+        error = err
+      }
+      expect(error).toBeDefined()
+      expect(error.status).toBe(404)
+    })
+    await sqsEnabled(async () => {
+      await context.doInAppContext(config.appId!, async () => {
+        await migration()
+      })
+      const designDoc = await db.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
+      expect(designDoc.sql.tables).toBeDefined()
+      const mainTableDef = designDoc.sql.tables[tableId]
+      expect(mainTableDef).toBeDefined()
+      expect(mainTableDef.fields.name).toEqual(SQLiteType.TEXT)
+      expect(mainTableDef.fields.description).toEqual(SQLiteType.TEXT)
+
+      const { tableId1, tableId2, rowId1, rowId2 } = oldLinkDocInfo()
+      const linkDoc = await db.get<LinkDocument>(oldLinkDocID())
+      expect(linkDoc.tableId).toEqual(
+        generateJunctionTableID(tableId1, tableId2)
+      )
+      // should have swapped the documents
+      expect(linkDoc.doc1.tableId).toEqual(tableId2)
+      expect(linkDoc.doc1.rowId).toEqual(rowId2)
+      expect(linkDoc.doc2.tableId).toEqual(tableId1)
+      expect(linkDoc.doc2.rowId).toEqual(rowId1)
+    })
+  })
+})
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index 2c91f1cb48..b44d7547a2 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -96,6 +96,7 @@ const environment = {
   DISABLE_THREADING: process.env.DISABLE_THREADING,
   DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
   DISABLE_RATE_LIMITING: process.env.DISABLE_RATE_LIMITING,
+  DISABLE_APP_MIGRATIONS: process.env.SKIP_APP_MIGRATIONS || false,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   SELF_HOSTED: process.env.SELF_HOSTED,
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index fdaeb3a03d..6ad356427b 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -1,13 +1,13 @@
 import { UserCtx } from "@budibase/types"
 import { checkMissingMigrations } from "../appMigrations"
-import { env } from "@budibase/backend-core"
+import env from "../environment"
 
 export default async (ctx: UserCtx, next: any) => {
   const { appId } = ctx
 
   // migrations can be disabled via environment variable if you
   // need to completely disable migrations, e.g. for testing
-  if (env.SKIP_APP_MIGRATIONS) {
+  if (env.DISABLE_APP_MIGRATIONS) {
     return next()
   }
 

From a4e646fc64eae71ddff60c5043236a400b67ddbb Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 17:26:37 +0100
Subject: [PATCH 102/128] Changing how latest migration is determined.

---
 packages/server/src/appMigrations/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index cac1e82716..8bd3ae7425 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -15,18 +15,15 @@ export type AppMigration = {
 }
 
 export function getLatestEnabledMigrationId(migrations?: AppMigration[]) {
-  const enabledMigrations: AppMigration[] = []
+  let latestMigrationId: string | undefined
   for (let migration of migrations || MIGRATIONS) {
     // if a migration is disabled, all migrations after it are disabled
     if (migration.disabled) {
       break
     }
-    enabledMigrations.push(migration)
+    latestMigrationId = migration.id
   }
-  return enabledMigrations
-    .map(m => m.id)
-    .sort()
-    .reverse()[0]
+  return latestMigrationId
 }
 
 function getTimestamp(versionId: string) {
@@ -41,7 +38,10 @@ export async function checkMissingMigrations(
   const currentVersion = await getAppMigrationVersion(appId)
   const latestMigration = getLatestEnabledMigrationId()
 
-  if (getTimestamp(currentVersion) < getTimestamp(latestMigration)) {
+  if (
+    latestMigration &&
+    getTimestamp(currentVersion) < getTimestamp(latestMigration)
+  ) {
     await queue.add(
       {
         appId,

From cd300b0453de15b30c5d08bd0ca00bbd35eb9a3d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 17:27:40 +0100
Subject: [PATCH 103/128] Linting.

---
 .../src/appMigrations/migrations/20240604153647_initial_sqs.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
index 6ad3c09c3c..800de1418a 100644
--- a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
+++ b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
@@ -3,7 +3,6 @@ import { allLinkDocs } from "../../db/utils"
 import LinkDocumentImpl from "../../db/linkedRows/LinkDocument"
 import sdk from "../../sdk"
 import env from "../../environment"
-import { DBError } from "@budibase/types"
 
 const migration = async () => {
   const linkDocs = await allLinkDocs()

From 5537f7b7820306713a520a23e619c9d1910c6a67 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 17:35:35 +0100
Subject: [PATCH 104/128] build fixes.

---
 packages/server/src/api/controllers/application.ts | 13 ++++++++-----
 packages/server/src/api/controllers/migrations.ts  |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 1555dc8afd..830acc55bf 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -358,11 +358,14 @@ async function performAppCreate(ctx: UserCtx<CreateAppRequest, App>) {
       await createApp(appId)
     }
 
-    // Initialise the app migration version as the latest one
-    await appMigrations.updateAppMigrationMetadata({
-      appId,
-      version: appMigrations.getLatestEnabledMigrationId(),
-    })
+    const latestMigrationId = appMigrations.getLatestEnabledMigrationId()
+    if (latestMigrationId) {
+      // Initialise the app migration version as the latest one
+      await appMigrations.updateAppMigrationMetadata({
+        appId,
+        version: latestMigrationId,
+      })
+    }
 
     await cache.app.invalidateAppMetadata(appId, newApplication)
     return newApplication
diff --git a/packages/server/src/api/controllers/migrations.ts b/packages/server/src/api/controllers/migrations.ts
index 97c0ae8712..89255e89b1 100644
--- a/packages/server/src/api/controllers/migrations.ts
+++ b/packages/server/src/api/controllers/migrations.ts
@@ -27,7 +27,9 @@ export async function getMigrationStatus(ctx: Ctx) {
 
   const latestAppliedMigration = await getAppMigrationVersion(appId)
 
-  const migrated = latestAppliedMigration >= getLatestEnabledMigrationId()
+  const latestMigrationId = getLatestEnabledMigrationId()
+  const migrated =
+    !latestMigrationId || latestAppliedMigration >= latestMigrationId
 
   ctx.body = { migrated }
   ctx.status = 200

From ab6614a6831ee6a29634638f5b9ecfd05e14689d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 6 Jun 2024 17:38:52 +0100
Subject: [PATCH 105/128] Capturing any 500s which occur from SQS cleanup - it
 appears to 500 if there is nothing to do.

---
 packages/backend-core/src/db/couch/DatabaseImpl.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 2b589ed09a..ed79a14340 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -328,7 +328,14 @@ export class DatabaseImpl implements Database {
   async sqlDiskCleanup(): Promise<void> {
     const dbName = this.name
     const url = `/${dbName}/_cleanup`
-    return await this._sqlQuery<void>(url, "POST")
+    try {
+      await this._sqlQuery<void>(url, "POST")
+    } catch (err: any) {
+      // hack for now - SQS throws a 500 when there is nothing to clean-up
+      if (err.status !== 500) {
+        throw err
+      }
+    }
   }
 
   // removes a document from sqlite

From 23362527eb0fce8d691fe5c7be3aa2a600b7dd93 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 08:34:33 +0200
Subject: [PATCH 106/128] Fix labelling for PClmnt

---
 .github/workflows/pr-labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 998c95be27..e2fa9f2515 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -33,6 +33,6 @@ jobs:
             {
                 "adrinr": "firestorm",
                 "samwho": "firestorm",
-                "pclmnt": "firestorm",
+                "PClmnt": "firestorm",
                 "mike12345567": "firestorm"
             }

From 9a2de11203b8cfb28f465b007b23663564ce1b1d Mon Sep 17 00:00:00 2001
From: Peter Clement <PClmnt@users.noreply.github.com>
Date: Fri, 7 Jun 2024 09:35:18 +0100
Subject: [PATCH 107/128] Allow users to only specify a binding when adding
 attachments (#13819)

* add ability for user to toggle bindable input for attachment

* error handling for missing keys

* improve error handling for smtp attachments

* remove log

* add test

* fixing some pr comments

* update test
---
 .../SetupPanel/AutomationBlockSetup.svelte    |  87 +++++++++---
 .../automation/SetupPanel/RowSelector.svelte  |  25 ++--
 .../SetupPanel/RowSelectorTypes.svelte        | 133 ++++++++++++------
 .../server/src/automations/automationUtils.ts |  16 ++-
 .../server/src/automations/steps/createRow.ts |   1 -
 .../src/automations/steps/sendSmtpEmail.ts    |   8 ++
 .../src/automations/tests/createRow.spec.ts   |  27 ++++
 7 files changed, 226 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 85ae1924d0..5d2e4ee28d 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -15,6 +15,7 @@
     Checkbox,
     DatePicker,
     DrawerContent,
+    Toggle,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
   import { automationStore, selectedAutomation, tables } from "stores/builder"
@@ -118,7 +119,6 @@
         searchableSchema: true,
       }).schema
     }
-
     try {
       if (isTestModal) {
         let newTestData = { schema }
@@ -385,6 +385,16 @@
     return params
   }
 
+  function toggleAttachmentBinding(e, key) {
+    onChange(
+      {
+        detail: "",
+      },
+      key
+    )
+    onChange({ detail: { useAttachmentBinding: e.detail } }, "meta")
+  }
+
   onMount(async () => {
     try {
       await environment.loadVariables()
@@ -462,27 +472,64 @@
               <div class="label-wrapper">
                 <Label>{label}</Label>
               </div>
-              <div class="attachment-field-width">
-                <KeyValueBuilder
-                  on:change={e =>
-                    onChange(
-                      {
-                        detail: e.detail.map(({ name, value }) => ({
-                          url: name,
-                          filename: value,
-                        })),
-                      },
-                      key
-                    )}
-                  object={handleAttachmentParams(inputData[key])}
-                  allowJS
-                  {bindings}
-                  keyBindings
-                  customButtonText={"Add attachment"}
-                  keyPlaceholder={"URL"}
-                  valuePlaceholder={"Filename"}
+              <div class="toggle-container">
+                <Toggle
+                  value={inputData?.meta?.useAttachmentBinding}
+                  text={"Use bindings"}
+                  size={"XS"}
+                  on:change={e => toggleAttachmentBinding(e, key)}
                 />
               </div>
+
+              <div class="attachment-field-width">
+                {#if !inputData?.meta?.useAttachmentBinding}
+                  <KeyValueBuilder
+                    on:change={e =>
+                      onChange(
+                        {
+                          detail: e.detail.map(({ name, value }) => ({
+                            url: name,
+                            filename: value,
+                          })),
+                        },
+                        key
+                      )}
+                    object={handleAttachmentParams(inputData[key])}
+                    allowJS
+                    {bindings}
+                    keyBindings
+                    customButtonText={"Add attachment"}
+                    keyPlaceholder={"URL"}
+                    valuePlaceholder={"Filename"}
+                  />
+                {:else if isTestModal}
+                  <ModalBindableInput
+                    title={value.title || label}
+                    value={inputData[key]}
+                    panel={AutomationBindingPanel}
+                    type={value.customType}
+                    on:change={e => onChange(e, key)}
+                    {bindings}
+                    updateOnChange={false}
+                  />
+                {:else}
+                  <div class="test">
+                    <DrawerBindableInput
+                      title={value.title ?? label}
+                      panel={AutomationBindingPanel}
+                      type={value.customType}
+                      value={inputData[key]}
+                      on:change={e => onChange(e, key)}
+                      {bindings}
+                      updateOnChange={false}
+                      placeholder={value.customType === "queryLimit"
+                        ? queryLimit
+                        : ""}
+                      drawerLeft="260px"
+                    />
+                  </div>
+                {/if}
+              </div>
             </div>
           {:else if value.customType === "filters"}
             <ActionButton on:click={drawer.show}>Define filters</ActionButton>
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index b5a54138ca..bd3bcda774 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -10,12 +10,12 @@
   import { TableNames } from "constants"
 
   const dispatch = createEventDispatcher()
-
   export let value
   export let meta
   export let bindings
   export let isTestModal
   export let isUpdateRow
+
   $: parsedBindings = bindings.map(binding => {
     let clone = Object.assign({}, binding)
     clone.icon = "ShareAndroid"
@@ -94,17 +94,22 @@
     dispatch("change", newValue)
   }
 
-  const onChangeSetting = (e, field) => {
-    let fields = {}
-    fields[field] = {
-      clearRelationships: e.detail,
+  const onChangeSetting = (field, key, value) => {
+    let newField = {}
+    newField[field] = {
+      [key]: value,
     }
+
+    let updatedFields = {
+      ...meta?.fields,
+      ...newField,
+    }
+
     dispatch("change", {
       key: "meta",
-      fields,
+      fields: updatedFields,
     })
   }
-
   // Ensure any nullish tableId values get set to empty string so
   // that the select works
   $: if (value?.tableId == null) value = { tableId: "" }
@@ -157,6 +162,9 @@
                 bindings={parsedBindings}
                 {value}
                 {onChange}
+                useAttachmentBinding={meta?.fields?.[field]
+                  ?.useAttachmentBinding}
+                {onChangeSetting}
               />
             </DrawerBindableSlot>
           {/if}
@@ -167,7 +175,8 @@
                 value={meta.fields?.[field]?.clearRelationships}
                 text={"Clear relationships if empty?"}
                 size={"S"}
-                on:change={e => onChangeSetting(e, field)}
+                on:change={e =>
+                  onChangeSetting(field, "clearRelationships", e.detail)}
               />
             </div>
           {/if}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 0a27360347..a43ff35c80 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -1,5 +1,11 @@
 <script>
-  import { Select, DatePicker, Multiselect, TextArea } from "@budibase/bbui"
+  import {
+    Select,
+    DatePicker,
+    Multiselect,
+    TextArea,
+    Toggle,
+  } from "@budibase/bbui"
   import { FieldType } from "@budibase/types"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
@@ -14,6 +20,8 @@
   export let value
   export let bindings
   export let isTestModal
+  export let useAttachmentBinding
+  export let onChangeSetting
 
   $: parsedBindings = bindings.map(binding => {
     let clone = Object.assign({}, binding)
@@ -27,6 +35,8 @@
     FieldType.SIGNATURE_SINGLE,
   ]
 
+  let previousBindingState = useAttachmentBinding
+
   function schemaHasOptions(schema) {
     return !!schema.constraints?.inclusion?.length
   }
@@ -34,13 +44,6 @@
   function handleAttachmentParams(keyValueObj) {
     let params = {}
 
-    if (
-      (schema.type === FieldType.ATTACHMENT_SINGLE ||
-        schema.type === FieldType.SIGNATURE_SINGLE) &&
-      Object.keys(keyValueObj).length === 0
-    ) {
-      return []
-    }
     if (!Array.isArray(keyValueObj) && keyValueObj) {
       keyValueObj = [keyValueObj]
     }
@@ -52,6 +55,26 @@
     }
     return params
   }
+
+  async function handleToggleChange(toggleField, event) {
+    if (event.detail === true) {
+      value[toggleField] = []
+    } else {
+      value[toggleField] = ""
+    }
+    previousBindingState = event.detail
+    onChangeSetting(toggleField, "useAttachmentBinding", event.detail)
+    onChange({ detail: value[toggleField] }, toggleField)
+  }
+
+  $: if (useAttachmentBinding !== previousBindingState) {
+    if (useAttachmentBinding) {
+      value[field] = []
+    } else {
+      value[field] = ""
+    }
+    previousBindingState = useAttachmentBinding
+  }
 </script>
 
 {#if schemaHasOptions(schema) && schema.type !== "array"}
@@ -108,38 +131,65 @@
     useLabel={false}
   />
 {:else if attachmentTypes.includes(schema.type)}
-  <div class="attachment-field-spacinng">
-    <KeyValueBuilder
-      on:change={e =>
-        onChange(
-          {
-            detail:
-              schema.type === FieldType.ATTACHMENT_SINGLE ||
-              schema.type === FieldType.SIGNATURE_SINGLE
-                ? e.detail.length > 0
-                  ? {
-                      url: e.detail[0].name,
-                      filename: e.detail[0].value,
-                    }
-                  : {}
-                : e.detail.map(({ name, value }) => ({
-                    url: name,
-                    filename: value,
-                  })),
-          },
-          field
-        )}
-      object={handleAttachmentParams(value[field])}
-      allowJS
-      {bindings}
-      keyBindings
-      customButtonText={"Add attachment"}
-      keyPlaceholder={"URL"}
-      valuePlaceholder={"Filename"}
-      actionButtonDisabled={(schema.type === FieldType.ATTACHMENT_SINGLE ||
-        schema.type === FieldType.SIGNATURE) &&
-        Object.keys(value[field]).length >= 1}
-    />
+  <div class="attachment-field-container">
+    <div class="toggle-container">
+      <Toggle
+        value={useAttachmentBinding}
+        text={"Use bindings"}
+        size={"XS"}
+        on:change={e => handleToggleChange(field, e)}
+      />
+    </div>
+    {#if !useAttachmentBinding}
+      <div class="attachment-field-spacing">
+        <KeyValueBuilder
+          on:change={async e => {
+            onChange(
+              {
+                detail:
+                  schema.type === FieldType.ATTACHMENT_SINGLE ||
+                  schema.type === FieldType.SIGNATURE_SINGLE
+                    ? e.detail.length > 0
+                      ? {
+                          url: e.detail[0].name,
+                          filename: e.detail[0].value,
+                        }
+                      : {}
+                    : e.detail.map(({ name, value }) => ({
+                        url: name,
+                        filename: value,
+                      })),
+              },
+              field
+            )
+          }}
+          object={handleAttachmentParams(value[field])}
+          allowJS
+          {bindings}
+          keyBindings
+          customButtonText={"Add attachment"}
+          keyPlaceholder={"URL"}
+          valuePlaceholder={"Filename"}
+          actionButtonDisabled={(schema.type === FieldType.ATTACHMENT_SINGLE ||
+            schema.type === FieldType.SIGNATURE) &&
+            Object.keys(value[field]).length >= 1}
+        />
+      </div>
+    {:else}
+      <div class="json-input-spacing">
+        <svelte:component
+          this={isTestModal ? ModalBindableInput : DrawerBindableInput}
+          panel={AutomationBindingPanel}
+          value={value[field]}
+          on:change={e => onChange(e, field)}
+          type="string"
+          bindings={parsedBindings}
+          allowJS={true}
+          updateOnChange={false}
+          title={schema.name}
+        />
+      </div>
+    {/if}
   </div>
 {:else if ["string", "number", "bigint", "barcodeqr", "array"].includes(schema.type)}
   <svelte:component
@@ -156,7 +206,8 @@
 {/if}
 
 <style>
-  .attachment-field-spacinng {
+  .attachment-field-spacing,
+  .json-input-spacing {
     margin-top: var(--spacing-s);
     margin-bottom: var(--spacing-l);
   }
diff --git a/packages/server/src/automations/automationUtils.ts b/packages/server/src/automations/automationUtils.ts
index de6e1b3d88..5467e0757c 100644
--- a/packages/server/src/automations/automationUtils.ts
+++ b/packages/server/src/automations/automationUtils.ts
@@ -99,6 +99,15 @@ export function getError(err: any) {
   return typeof err !== "string" ? err.toString() : err
 }
 
+export function guardAttachment(attachmentObject: any) {
+  if (!("url" in attachmentObject) || !("filename" in attachmentObject)) {
+    const providedKeys = Object.keys(attachmentObject).join(", ")
+    throw new Error(
+      `Attachments must have both "url" and "filename" keys. You have provided: ${providedKeys}`
+    )
+  }
+}
+
 export async function sendAutomationAttachmentsToStorage(
   tableId: string,
   row: Row
@@ -116,9 +125,15 @@ export async function sendAutomationAttachmentsToStorage(
       schema?.type === FieldType.ATTACHMENT_SINGLE ||
       schema?.type === FieldType.SIGNATURE_SINGLE
     ) {
+      if (Array.isArray(value)) {
+        value.forEach(item => guardAttachment(item))
+      } else {
+        guardAttachment(value)
+      }
       attachmentRows[prop] = value
     }
   }
+
   for (const [prop, attachments] of Object.entries(attachmentRows)) {
     if (Array.isArray(attachments)) {
       if (attachments.length) {
@@ -133,7 +148,6 @@ export async function sendAutomationAttachmentsToStorage(
 
   return row
 }
-
 async function generateAttachmentRow(attachment: AutomationAttachment) {
   const prodAppId = context.getProdAppId()
 
diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts
index 5b5084b465..c7f5fcff3b 100644
--- a/packages/server/src/automations/steps/createRow.ts
+++ b/packages/server/src/automations/steps/createRow.ts
@@ -90,7 +90,6 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) {
       tableId: inputs.row.tableId,
     },
   })
-
   try {
     inputs.row = await cleanUpRow(inputs.row.tableId, inputs.row)
     inputs.row = await sendAutomationAttachmentsToStorage(
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts
index 31a7759dea..bcb1699c6b 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@@ -118,6 +118,14 @@ export async function run({ inputs }: AutomationStepInput) {
   }
   to = to || undefined
 
+  if (attachments) {
+    if (Array.isArray(attachments)) {
+      attachments.forEach(item => automationUtils.guardAttachment(item))
+    } else {
+      automationUtils.guardAttachment(attachments)
+    }
+  }
+
   try {
     let response = await sendSmtpEmail({
       to,
diff --git a/packages/server/src/automations/tests/createRow.spec.ts b/packages/server/src/automations/tests/createRow.spec.ts
index e78236c5ac..62e9e24f9e 100644
--- a/packages/server/src/automations/tests/createRow.spec.ts
+++ b/packages/server/src/automations/tests/createRow.spec.ts
@@ -128,4 +128,31 @@ describe("test the create row action", () => {
     expect(objectData).toBeDefined()
     expect(objectData.ContentLength).toBeGreaterThan(0)
   })
+
+  it("should check that attachment without the correct keys throws an error", async () => {
+    let attachmentTable = await config.createTable(
+      basicTableWithAttachmentField()
+    )
+
+    let attachmentRow: any = {
+      tableId: attachmentTable._id,
+    }
+
+    let filename = "test2.txt"
+    let presignedUrl = await uploadTestFile(filename)
+    let attachmentObject = {
+      wrongKey: presignedUrl,
+      anotherWrongKey: filename,
+    }
+
+    attachmentRow.single_file_attachment = attachmentObject
+    const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, {
+      row: attachmentRow,
+    })
+
+    expect(res.success).toEqual(false)
+    expect(res.response).toEqual(
+      'Error: Attachments must have both "url" and "filename" keys. You have provided: wrongKey, anotherWrongKey'
+    )
+  })
 })

From f4e14db22a361ee1dd9b5d6696a0ccc2592ceff0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 10:54:14 +0200
Subject: [PATCH 108/128] Add failing test

---
 .../server/src/api/routes/tests/row.spec.ts   | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 4801ac4c55..ccfd3891c5 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -38,7 +38,7 @@ describe.each([
   [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)],
   [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
   [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
-])("/rows (%s)", (__, dsProvider) => {
+])("/rows (%s)", (providerType, dsProvider) => {
   const isInternal = dsProvider === undefined
   const config = setup.getConfig()
 
@@ -693,6 +693,49 @@ describe.each([
       })
       expect(resp.relationship.length).toBe(1)
     })
+
+    !isInternal &&
+      // TODO: SQL is having issues creating composite keys
+      providerType !== DatabaseName.SQL_SERVER &&
+      it("should support updating fields that are part of a composite key", async () => {
+        const tableRequest = saveTableRequest({
+          primary: ["number", "string"],
+          schema: {
+            string: {
+              type: FieldType.STRING,
+              name: "string",
+            },
+            number: {
+              type: FieldType.NUMBER,
+              name: "number",
+            },
+          },
+        })
+
+        delete tableRequest.schema.id
+
+        const table = await config.api.table.save(tableRequest)
+
+        const stringValue = generator.word()
+        const naturalValue = generator.integer({ min: 0, max: 1000 })
+
+        const existing = await config.api.row.save(table._id!, {
+          string: stringValue,
+          number: naturalValue,
+        })
+
+        expect(existing._id).toEqual(`%5B${naturalValue}%2C'${stringValue}'%5D`)
+
+        const row = await config.api.row.patch(table._id!, {
+          _id: existing._id!,
+          _rev: existing._rev!,
+          tableId: table._id!,
+          string: stringValue,
+          number: 1500,
+        })
+
+        expect(row._id).toEqual(`%5B${"1500"}%2C'${stringValue}'%5D`)
+      })
   })
 
   describe("destroy", () => {

From b86501e25eb7ec109377dec7cecc0527caecf80c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 10:54:26 +0200
Subject: [PATCH 109/128] Fix

---
 packages/server/src/api/controllers/row/external.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index e0e3cb6c18..51511840e8 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -25,6 +25,7 @@ import {
   outputProcessing,
 } from "../../../utilities/rowProcessor"
 import { cloneDeep } from "lodash"
+import { generateIdForRow } from "./utils"
 
 export async function handleRequest<T extends Operation>(
   operation: T,
@@ -59,7 +60,9 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
     id: breakRowIdField(_id),
     row: dataToUpdate,
   })
-  const row = await sdk.rows.external.getRow(tableId, _id, {
+
+  const updatedId = generateIdForRow(dataToUpdate, table)
+  const row = await sdk.rows.external.getRow(tableId, updatedId, {
     relationships: true,
   })
   const enrichedRow = await outputProcessing(table, row, {

From b22ea1b0f9e9363e0164bb2f07a9cbd581d76759 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 11:11:32 +0200
Subject: [PATCH 110/128] Fix test

---
 packages/server/src/api/controllers/row/external.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 51511840e8..f57a52a307 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -61,7 +61,8 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
     row: dataToUpdate,
   })
 
-  const updatedId = generateIdForRow(dataToUpdate, table)
+  // The id might have been changed, so the refetching would fail. Recalculating the id just in case
+  const updatedId = generateIdForRow({ _id, ...dataToUpdate }, table)
   const row = await sdk.rows.external.getRow(tableId, updatedId, {
     relationships: true,
   })

From 20d1b81099408de8455ad2c8c6410c32d65d9477 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 11:30:35 +0200
Subject: [PATCH 111/128] Fix tests

---
 packages/server/src/api/controllers/row/external.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index f57a52a307..32bd1f313a 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -62,7 +62,7 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
   })
 
   // The id might have been changed, so the refetching would fail. Recalculating the id just in case
-  const updatedId = generateIdForRow({ _id, ...dataToUpdate }, table)
+  const updatedId = generateIdForRow(ctx.request.body, table)
   const row = await sdk.rows.external.getRow(tableId, updatedId, {
     relationships: true,
   })

From 853810704c22e5d4a604476209adeb348d83e03b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 7 Jun 2024 11:39:36 +0200
Subject: [PATCH 112/128] Fix patch

---
 packages/server/src/api/controllers/row/external.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 32bd1f313a..d301155231 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -56,13 +56,18 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
     throw { validation: validateResult.errors }
   }
 
+  const beforeRow = await sdk.rows.external.getRow(tableId, _id, {
+    relationships: true,
+  })
+
   const response = await handleRequest(Operation.UPDATE, tableId, {
     id: breakRowIdField(_id),
     row: dataToUpdate,
   })
 
   // The id might have been changed, so the refetching would fail. Recalculating the id just in case
-  const updatedId = generateIdForRow(ctx.request.body, table)
+  const updatedId =
+    generateIdForRow({ ...beforeRow, ...dataToUpdate }, table) || _id
   const row = await sdk.rows.external.getRow(tableId, updatedId, {
     relationships: true,
   })

From 93709b84cfc1741db2face176ae97609907288e5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 7 Jun 2024 10:44:51 +0000
Subject: [PATCH 113/128] Bump version to 2.28.4

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 8b1fa18d23..c551cf6bd9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.28.3",
+  "version": "2.28.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From d4068609ca01f35ada171e7e3bc78b79846c8e8b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 14:03:23 +0100
Subject: [PATCH 114/128] Update CouchDB image from 3.2.1 to 3.3.3.

---
 charts/budibase/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 58bd889857..4e80be7322 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -641,7 +641,7 @@ couchdb:
     # @ignore
     repository: budibase/couchdb
     # @ignore
-    tag: v3.2.1
+    tag: v3.3.3
     # @ignore
     pullPolicy: Always
 

From f2e3789ad2490b66b3598025e1cbcd8556cf6d29 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 14:24:39 +0100
Subject: [PATCH 115/128] Rename rename test from mysql.spec.ts, it's covered
 in table.spec.ts

---
 .../server/src/integration-test/mysql.spec.ts | 59 +------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

diff --git a/packages/server/src/integration-test/mysql.spec.ts b/packages/server/src/integration-test/mysql.spec.ts
index 8cf4fb8212..04a2541ad6 100644
--- a/packages/server/src/integration-test/mysql.spec.ts
+++ b/packages/server/src/integration-test/mysql.spec.ts
@@ -4,13 +4,7 @@ import {
   MakeRequestResponse,
 } from "../api/routes/public/tests/utils"
 import * as setup from "../api/routes/tests/utilities"
-import {
-  Datasource,
-  FieldType,
-  Table,
-  TableRequest,
-  TableSourceType,
-} from "@budibase/types"
+import { Datasource, FieldType, Table, TableSourceType } from "@budibase/types"
 import {
   DatabaseName,
   getDatasource,
@@ -231,57 +225,6 @@ describe("mysql integrations", () => {
     })
   })
 
-  describe("POST /api/tables/", () => {
-    it("will rename a column", async () => {
-      await makeRequest("post", "/api/tables/", primaryMySqlTable)
-
-      let renameColumnOnTable: TableRequest = {
-        ...primaryMySqlTable,
-        schema: {
-          id: {
-            name: "id",
-            type: FieldType.AUTO,
-            autocolumn: true,
-            externalType: "unsigned integer",
-          },
-          name: {
-            name: "name",
-            type: FieldType.STRING,
-            externalType: "text",
-          },
-          description: {
-            name: "description",
-            type: FieldType.STRING,
-            externalType: "text",
-          },
-          age: {
-            name: "age",
-            type: FieldType.NUMBER,
-            externalType: "float(8,2)",
-          },
-        },
-      }
-
-      const response = await makeRequest(
-        "post",
-        "/api/tables/",
-        renameColumnOnTable
-      )
-
-      const ds = (
-        await makeRequest("post", `/api/datasources/${datasource._id}/schema`)
-      ).body.datasource
-
-      expect(response.status).toEqual(200)
-      expect(Object.keys(ds.entities![primaryMySqlTable.name].schema)).toEqual([
-        "id",
-        "name",
-        "description",
-        "age",
-      ])
-    })
-  })
-
   describe("POST /api/datasources/:datasourceId/schema", () => {
     let tableName: string
 

From c07d73beaf99ed8ea5d38f2a1a794ebf08b6e9f8 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 16:35:46 +0100
Subject: [PATCH 116/128] Modernise datasource.spec.ts.

---
 .../__snapshots__/datasource.spec.ts.snap     |  91 ---
 .../src/api/routes/tests/datasource.spec.ts   | 571 +++++++++---------
 .../src/tests/utilities/api/datasource.ts     |   4 +
 3 files changed, 288 insertions(+), 378 deletions(-)
 delete mode 100644 packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap

diff --git a/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap b/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap
deleted file mode 100644
index 57d79db24b..0000000000
--- a/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap
+++ /dev/null
@@ -1,91 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`/datasources fetch returns all the datasources from the server 1`] = `
-[
-  {
-    "config": {},
-    "entities": [
-      {
-        "_id": "ta_users",
-        "_rev": "1-73b7912e6cbdd3d696febc60f3715844",
-        "createdAt": "2020-01-01T00:00:00.000Z",
-        "name": "Users",
-        "primaryDisplay": "email",
-        "schema": {
-          "email": {
-            "constraints": {
-              "email": true,
-              "length": {
-                "maximum": "",
-              },
-              "presence": true,
-              "type": "string",
-            },
-            "name": "email",
-            "type": "string",
-          },
-          "firstName": {
-            "constraints": {
-              "presence": false,
-              "type": "string",
-            },
-            "name": "firstName",
-            "type": "string",
-          },
-          "lastName": {
-            "constraints": {
-              "presence": false,
-              "type": "string",
-            },
-            "name": "lastName",
-            "type": "string",
-          },
-          "roleId": {
-            "constraints": {
-              "inclusion": [
-                "ADMIN",
-                "POWER",
-                "BASIC",
-                "PUBLIC",
-              ],
-              "presence": false,
-              "type": "string",
-            },
-            "name": "roleId",
-            "type": "options",
-          },
-          "status": {
-            "constraints": {
-              "inclusion": [
-                "active",
-                "inactive",
-              ],
-              "presence": false,
-              "type": "string",
-            },
-            "name": "status",
-            "type": "options",
-          },
-        },
-        "sourceId": "bb_internal",
-        "sourceType": "internal",
-        "type": "table",
-        "updatedAt": "2020-01-01T00:00:00.000Z",
-        "views": {},
-      },
-    ],
-    "name": "Budibase DB",
-    "source": "BUDIBASE",
-    "type": "budibase",
-  },
-  {
-    "config": {},
-    "createdAt": "2020-01-01T00:00:00.000Z",
-    "isSQL": true,
-    "name": "Test",
-    "source": "POSTGRES",
-    "type": "datasource",
-    "updatedAt": "2020-01-01T00:00:00.000Z",
-  },
-]
-`;
diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index f2cea90675..349a2be9fd 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -4,14 +4,12 @@ import { getCachedVariable } from "../../../threads/utils"
 import { context, events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
-import tk from "timekeeper"
-import { mocks } from "@budibase/backend-core/tests"
+import { generator } from "@budibase/backend-core/tests"
 import {
   Datasource,
   FieldSchema,
   BBReferenceFieldSubType,
   FieldType,
-  QueryPreview,
   RelationshipType,
   SourceName,
   Table,
@@ -21,36 +19,34 @@ import {
 import { DatabaseName, getDatasource } from "../../../integrations/tests/utils"
 import { tableForDatasource } from "../../../tests/utilities/structures"
 
-tk.freeze(mocks.date.MOCK_DATE)
-
-let { basicDatasource } = setup.structures
-
 describe("/datasources", () => {
-  let request = setup.getRequest()
-  let config = setup.getConfig()
-  let datasource: any
+  const config = setup.getConfig()
+  let datasource: Datasource
 
+  beforeAll(async () => {
+    await config.init()
+  })
   afterAll(setup.afterAll)
 
-  async function setupTest() {
-    await config.init()
-    datasource = await config.createDatasource()
+  beforeEach(async () => {
+    datasource = await config.api.datasource.create({
+      type: "datasource",
+      name: "Test",
+      source: SourceName.POSTGRES,
+      config: {},
+    })
     jest.clearAllMocks()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a new datasource", async () => {
-      const res = await request
-        .post(`/api/datasources`)
-        .send(basicDatasource())
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-
-      expect(res.body.datasource.name).toEqual("Test")
-      expect(res.body.errors).toEqual({})
+      const ds = await config.api.datasource.create({
+        type: "datasource",
+        name: "Test",
+        source: SourceName.POSTGRES,
+        config: {},
+      })
+      expect(ds.name).toEqual("Test")
       expect(events.datasource.created).toHaveBeenCalledTimes(1)
     })
 
@@ -72,88 +68,71 @@ describe("/datasources", () => {
     })
   })
 
-  describe("update", () => {
-    it("should update an existing datasource", async () => {
-      datasource.name = "Updated Test"
-      const res = await request
-        .put(`/api/datasources/${datasource._id}`)
-        .send(datasource)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
+  describe("dynamic variables", () => {
+    it("should invalidate changed or removed variables", async () => {
+      let datasource = await config.api.datasource.create({
+        type: "datasource",
+        name: "Rest",
+        source: SourceName.REST,
+        config: {},
+      })
 
-      expect(res.body.datasource.name).toEqual("Updated Test")
-      expect(res.body.errors).toBeUndefined()
-      expect(events.datasource.updated).toHaveBeenCalledTimes(1)
-    })
+      const query = await config.api.query.save({
+        datasourceId: datasource._id!,
+        fields: {
+          path: "www.google.com",
+        },
+        parameters: [],
+        transformer: null,
+        queryVerb: "read",
+        name: datasource.name!,
+        schema: {},
+        readable: true,
+      })
 
-    describe("dynamic variables", () => {
-      async function preview(
-        datasource: any,
-        fields: { path: string; queryString: string }
-      ) {
-        const queryPreview: QueryPreview = {
-          fields,
-          datasourceId: datasource._id,
-          parameters: [],
-          transformer: null,
-          queryVerb: "read",
-          name: datasource.name,
-          schema: {},
-          readable: true,
-        }
-        return config.api.query.preview(queryPreview)
-      }
+      datasource = await config.api.datasource.update({
+        ...datasource,
+        config: {
+          dynamicVariables: [
+            {
+              queryId: query._id,
+              name: "variable3",
+              value: "{{ data.0.[value] }}",
+            },
+          ],
+        },
+      })
 
-      it("should invalidate changed or removed variables", async () => {
-        const { datasource, query } = await config.dynamicVariableDatasource()
-        // preview once to cache variables
-        await preview(datasource, {
+      // preview once to cache variables
+      await config.api.query.preview({
+        fields: {
           path: "www.example.com",
           queryString: "test={{ variable3 }}",
-        })
-        // check variables in cache
-        let contents = await getCachedVariable(query._id!, "variable3")
-        expect(contents.rows.length).toEqual(1)
-
-        // update the datasource to remove the variables
-        datasource.config!.dynamicVariables = []
-        const res = await request
-          .put(`/api/datasources/${datasource._id}`)
-          .send(datasource)
-          .set(config.defaultHeaders())
-          .expect("Content-Type", /json/)
-          .expect(200)
-        expect(res.body.errors).toBeUndefined()
-
-        // check variables no longer in cache
-        contents = await getCachedVariable(query._id!, "variable3")
-        expect(contents).toBe(null)
+        },
+        datasourceId: datasource._id!,
+        parameters: [],
+        transformer: null,
+        queryVerb: "read",
+        name: datasource.name!,
+        schema: {},
+        readable: true,
       })
+
+      // check variables in cache
+      let contents = await getCachedVariable(query._id!, "variable3")
+      expect(contents.rows.length).toEqual(1)
+
+      // update the datasource to remove the variables
+      datasource.config!.dynamicVariables = []
+      await config.api.datasource.update(datasource)
+
+      // check variables no longer in cache
+      contents = await getCachedVariable(query._id!, "variable3")
+      expect(contents).toBe(null)
     })
   })
 
-  describe("fetch", () => {
-    beforeAll(setupTest)
-
-    it("returns all the datasources from the server", async () => {
-      const res = await request
-        .get(`/api/datasources`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-
-      const datasources = res.body
-
-      // remove non-deterministic fields
-      for (let source of datasources) {
-        delete source._id
-        delete source._rev
-      }
-
-      expect(datasources).toMatchSnapshot()
-    })
-
+  describe("permissions", () => {
     it("should apply authorization to endpoint", async () => {
       await checkBuilderEndpoint({
         config,
@@ -161,41 +140,8 @@ describe("/datasources", () => {
         url: `/api/datasources`,
       })
     })
-  })
 
-  describe("find", () => {
-    it("should be able to find a datasource", async () => {
-      const res = await request
-        .get(`/api/datasources/${datasource._id}`)
-        .set(config.defaultHeaders())
-        .expect(200)
-      expect(res.body._rev).toBeDefined()
-      expect(res.body._id).toEqual(datasource._id)
-    })
-  })
-
-  describe("destroy", () => {
-    beforeAll(setupTest)
-
-    it("deletes queries for the datasource after deletion and returns a success message", async () => {
-      await config.createQuery()
-
-      await request
-        .delete(`/api/datasources/${datasource._id}/${datasource._rev}`)
-        .set(config.defaultHeaders())
-        .expect(200)
-
-      const res = await request
-        .get(`/api/datasources`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-
-      expect(res.body.length).toEqual(1)
-      expect(events.datasource.deleted).toHaveBeenCalledTimes(1)
-    })
-
-    it("should apply authorization to endpoint", async () => {
+    it("should apply authorization to delete endpoint", async () => {
       await checkBuilderEndpoint({
         config,
         method: "DELETE",
@@ -204,175 +150,226 @@ describe("/datasources", () => {
     })
   })
 
-  describe("check secret replacement", () => {
-    async function makeDatasource() {
-      datasource = basicDatasource()
-      datasource.datasource.config.password = "testing"
-      const res = await request
-        .post(`/api/datasources`)
-        .send(datasource)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-      return res.body.datasource
-    }
-
-    it("should save a datasource with password", async () => {
-      const datasource = await makeDatasource()
-      expect(datasource.config.password).toBe("--secret-value--")
-    })
-
-    it("should not the password on update with the --secret-value--", async () => {
-      const datasource = await makeDatasource()
-      await request
-        .put(`/api/datasources/${datasource._id}`)
-        .send(datasource)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-      await context.doInAppContext(config.getAppId(), async () => {
-        const dbDatasource: any = await sdk.datasources.get(datasource._id)
-        expect(dbDatasource.config.password).toBe("testing")
-      })
-    })
-  })
-
   describe.each([
     [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)],
     [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)],
     [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
     [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
-  ])("fetch schema (%s)", (_, dsProvider) => {
-    beforeAll(async () => {
+  ])("%s", (_, dsProvider) => {
+    beforeEach(async () => {
       datasource = await config.api.datasource.create(await dsProvider)
     })
 
-    it("fetching schema will not drop tables or columns", async () => {
-      const datasourceId = datasource!._id!
+    describe("get", () => {
+      it("should be able to get a datasource", async () => {
+        const ds = await config.api.datasource.get(datasource._id!)
+        expect(ds._id).toEqual(datasource._id)
+        expect(ds._rev).toBeDefined()
+      })
 
-      const simpleTable = await config.api.table.save(
-        tableForDatasource(datasource, {
-          name: "simple",
-          schema: {
-            name: {
-              name: "name",
-              type: FieldType.STRING,
+      it("should not return database password", async () => {
+        const ds = await config.api.datasource.get(datasource._id!)
+        expect(ds.config!.password).toBe("--secret-value--")
+      })
+    })
+
+    describe("list", () => {
+      it("returns all the datasources", async () => {
+        const datasources = await config.api.datasource.fetch()
+        expect(datasources).toContainEqual(expect.objectContaining(datasource))
+      })
+    })
+
+    describe("put", () => {
+      it("should update an existing datasource", async () => {
+        const newName = generator.guid()
+        datasource.name = newName
+        const updatedDs = await config.api.datasource.update(datasource)
+        expect(updatedDs.name).toEqual(newName)
+        expect(events.datasource.updated).toHaveBeenCalledTimes(1)
+      })
+
+      it("should not overwrite database password with --secret-value--", async () => {
+        const password = await context.doInAppContext(
+          config.getAppId(),
+          async () => {
+            const ds = await sdk.datasources.get(datasource._id!)
+            return ds.config!.password
+          }
+        )
+
+        expect(password).not.toBe("--secret-value--")
+
+        const ds = await config.api.datasource.get(datasource._id!)
+        expect(ds.config!.password).toBe("--secret-value--")
+
+        await config.api.datasource.update(
+          await config.api.datasource.get(datasource._id!)
+        )
+
+        const newPassword = await context.doInAppContext(
+          config.getAppId(),
+          async () => {
+            const ds = await sdk.datasources.get(datasource._id!)
+            return ds.config!.password
+          }
+        )
+
+        expect(newPassword).not.toBe("--secret-value--")
+        expect(newPassword).toBe(password)
+      })
+    })
+
+    describe("destroy", () => {
+      it("deletes queries for the datasource after deletion and returns a success message", async () => {
+        await config.api.query.save({
+          datasourceId: datasource._id!,
+          name: "Test Query",
+          parameters: [],
+          fields: {},
+          schema: {},
+          queryVerb: "read",
+          transformer: null,
+          readable: true,
+        })
+
+        await config.api.datasource.delete(datasource)
+        const datasources = await config.api.datasource.fetch()
+        expect(datasources).not.toContainEqual(
+          expect.objectContaining(datasource)
+        )
+        expect(events.datasource.deleted).toHaveBeenCalledTimes(1)
+      })
+    })
+
+    describe("schema", () => {
+      it("fetching schema will not drop tables or columns", async () => {
+        const datasourceId = datasource!._id!
+
+        const simpleTable = await config.api.table.save(
+          tableForDatasource(datasource, {
+            name: "simple",
+            schema: {
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+              },
+            },
+          })
+        )
+
+        const fullSchema: {
+          [type in SupportedSqlTypes]: FieldSchema & { type: type }
+        } = {
+          [FieldType.STRING]: {
+            name: "string",
+            type: FieldType.STRING,
+            constraints: {
+              presence: true,
             },
           },
-        })
-      )
-
-      const fullSchema: {
-        [type in SupportedSqlTypes]: FieldSchema & { type: type }
-      } = {
-        [FieldType.STRING]: {
-          name: "string",
-          type: FieldType.STRING,
-          constraints: {
-            presence: true,
+          [FieldType.LONGFORM]: {
+            name: "longform",
+            type: FieldType.LONGFORM,
           },
-        },
-        [FieldType.LONGFORM]: {
-          name: "longform",
-          type: FieldType.LONGFORM,
-        },
-        [FieldType.OPTIONS]: {
-          name: "options",
-          type: FieldType.OPTIONS,
-          constraints: {
-            presence: { allowEmpty: false },
-          },
-        },
-        [FieldType.NUMBER]: {
-          name: "number",
-          type: FieldType.NUMBER,
-        },
-        [FieldType.BOOLEAN]: {
-          name: "boolean",
-          type: FieldType.BOOLEAN,
-        },
-        [FieldType.ARRAY]: {
-          name: "array",
-          type: FieldType.ARRAY,
-        },
-        [FieldType.DATETIME]: {
-          name: "datetime",
-          type: FieldType.DATETIME,
-          dateOnly: true,
-          timeOnly: false,
-        },
-        [FieldType.LINK]: {
-          name: "link",
-          type: FieldType.LINK,
-          tableId: simpleTable._id!,
-          relationshipType: RelationshipType.ONE_TO_MANY,
-          fieldName: "link",
-        },
-        [FieldType.FORMULA]: {
-          name: "formula",
-          type: FieldType.FORMULA,
-          formula: "any formula",
-        },
-        [FieldType.BARCODEQR]: {
-          name: "barcodeqr",
-          type: FieldType.BARCODEQR,
-        },
-        [FieldType.BIGINT]: {
-          name: "bigint",
-          type: FieldType.BIGINT,
-        },
-        [FieldType.BB_REFERENCE]: {
-          name: "bb_reference",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
-        [FieldType.BB_REFERENCE_SINGLE]: {
-          name: "bb_reference_single",
-          type: FieldType.BB_REFERENCE_SINGLE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
-      }
-
-      await config.api.table.save(
-        tableForDatasource(datasource, {
-          name: "full",
-          schema: fullSchema,
-        })
-      )
-
-      const persisted = await config.api.datasource.get(datasourceId)
-      await config.api.datasource.fetchSchema(datasourceId)
-
-      const updated = await config.api.datasource.get(datasourceId)
-      const expected: Datasource = {
-        ...persisted,
-        entities:
-          persisted?.entities &&
-          Object.entries(persisted.entities).reduce<Record<string, Table>>(
-            (acc, [tableName, table]) => {
-              acc[tableName] = {
-                ...table,
-                primaryDisplay: expect.not.stringMatching(
-                  new RegExp(`^${table.primaryDisplay || ""}$`)
-                ),
-                schema: Object.entries(table.schema).reduce<TableSchema>(
-                  (acc, [fieldName, field]) => {
-                    acc[fieldName] = expect.objectContaining({
-                      ...field,
-                    })
-                    return acc
-                  },
-                  {}
-                ),
-              }
-              return acc
+          [FieldType.OPTIONS]: {
+            name: "options",
+            type: FieldType.OPTIONS,
+            constraints: {
+              presence: { allowEmpty: false },
             },
-            {}
-          ),
+          },
+          [FieldType.NUMBER]: {
+            name: "number",
+            type: FieldType.NUMBER,
+          },
+          [FieldType.BOOLEAN]: {
+            name: "boolean",
+            type: FieldType.BOOLEAN,
+          },
+          [FieldType.ARRAY]: {
+            name: "array",
+            type: FieldType.ARRAY,
+          },
+          [FieldType.DATETIME]: {
+            name: "datetime",
+            type: FieldType.DATETIME,
+            dateOnly: true,
+            timeOnly: false,
+          },
+          [FieldType.LINK]: {
+            name: "link",
+            type: FieldType.LINK,
+            tableId: simpleTable._id!,
+            relationshipType: RelationshipType.ONE_TO_MANY,
+            fieldName: "link",
+          },
+          [FieldType.FORMULA]: {
+            name: "formula",
+            type: FieldType.FORMULA,
+            formula: "any formula",
+          },
+          [FieldType.BARCODEQR]: {
+            name: "barcodeqr",
+            type: FieldType.BARCODEQR,
+          },
+          [FieldType.BIGINT]: {
+            name: "bigint",
+            type: FieldType.BIGINT,
+          },
+          [FieldType.BB_REFERENCE]: {
+            name: "bb_reference",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+          },
+          [FieldType.BB_REFERENCE_SINGLE]: {
+            name: "bb_reference_single",
+            type: FieldType.BB_REFERENCE_SINGLE,
+            subtype: BBReferenceFieldSubType.USER,
+          },
+        }
 
-        _rev: expect.any(String),
-      }
-      expect(updated).toEqual(expected)
+        await config.api.table.save(
+          tableForDatasource(datasource, {
+            name: "full",
+            schema: fullSchema,
+          })
+        )
+
+        const persisted = await config.api.datasource.get(datasourceId)
+        await config.api.datasource.fetchSchema(datasourceId)
+
+        const updated = await config.api.datasource.get(datasourceId)
+        const expected: Datasource = {
+          ...persisted,
+          entities:
+            persisted?.entities &&
+            Object.entries(persisted.entities).reduce<Record<string, Table>>(
+              (acc, [tableName, table]) => {
+                acc[tableName] = {
+                  ...table,
+                  primaryDisplay: expect.not.stringMatching(
+                    new RegExp(`^${table.primaryDisplay || ""}$`)
+                  ),
+                  schema: Object.entries(table.schema).reduce<TableSchema>(
+                    (acc, [fieldName, field]) => {
+                      acc[fieldName] = expect.objectContaining({
+                        ...field,
+                      })
+                      return acc
+                    },
+                    {}
+                  ),
+                }
+                return acc
+              },
+              {}
+            ),
+
+          _rev: expect.any(String),
+        }
+        expect(updated).toEqual(expected)
+      })
     })
   })
 })
diff --git a/packages/server/src/tests/utilities/api/datasource.ts b/packages/server/src/tests/utilities/api/datasource.ts
index bb4c74093c..780a7fc7a3 100644
--- a/packages/server/src/tests/utilities/api/datasource.ts
+++ b/packages/server/src/tests/utilities/api/datasource.ts
@@ -61,6 +61,10 @@ export class DatasourceAPI extends TestAPI {
     })
   }
 
+  fetch = async (expectations?: Expectations) => {
+    return await this._get<Datasource[]>(`/api/datasources`, { expectations })
+  }
+
   query = async (
     query: Omit<QueryJson, "meta"> & Partial<Pick<QueryJson, "meta">>,
     expectations?: Expectations

From d68232037158d49834391b9d4376a8fd2b4c757b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 16:40:25 +0100
Subject: [PATCH 117/128] Fix last test.

---
 packages/server/src/api/routes/tests/datasource.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 349a2be9fd..2d433edb4f 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -367,6 +367,7 @@ describe("/datasources", () => {
             ),
 
           _rev: expect.any(String),
+          updatedAt: expect.any(String),
         }
         expect(updated).toEqual(expected)
       })

From 85c372c4d6fba7e9b066f97b807e4c44513af58f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 16:56:07 +0100
Subject: [PATCH 118/128] Move some mysql.spec.ts and postgres.spec.ts tests
 into datasource.spec.ts.

---
 .../src/api/routes/tests/datasource.spec.ts   | 57 ++++++++++++++++++-
 .../server/src/integration-test/mysql.spec.ts | 48 ----------------
 .../src/integration-test/postgres.spec.ts     | 48 ----------------
 .../src/tests/utilities/api/datasource.ts     | 11 ++++
 4 files changed, 67 insertions(+), 97 deletions(-)

diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 2d433edb4f..f800ecc235 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -156,8 +156,10 @@ describe("/datasources", () => {
     [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
     [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
   ])("%s", (_, dsProvider) => {
+    let rawDatasource: Datasource
     beforeEach(async () => {
-      datasource = await config.api.datasource.create(await dsProvider)
+      rawDatasource = await dsProvider
+      datasource = await config.api.datasource.create(rawDatasource)
     })
 
     describe("get", () => {
@@ -372,5 +374,58 @@ describe("/datasources", () => {
         expect(updated).toEqual(expected)
       })
     })
+
+    describe("verify", () => {
+      it("should be able to verify the connection", async () => {
+        await config.api.datasource.verify(
+          {
+            datasource: rawDatasource,
+          },
+          {
+            body: {
+              connected: true,
+            },
+          }
+        )
+      })
+
+      it("should state an invalid datasource cannot connect", async () => {
+        await config.api.datasource.verify(
+          {
+            datasource: {
+              ...rawDatasource,
+              config: {
+                ...rawDatasource.config,
+                password: "wrongpassword",
+              },
+            },
+          },
+          {
+            body: {
+              connected: false,
+              error: /.*/, // error message differs between databases
+            },
+          }
+        )
+      })
+    })
+
+    describe("info", () => {
+      it("should fetch information about postgres datasource", async () => {
+        const table = await config.api.table.save(
+          tableForDatasource(datasource, {
+            schema: {
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+              },
+            },
+          })
+        )
+
+        const info = await config.api.datasource.info(datasource)
+        expect(info.tableNames).toContain(table.name)
+      })
+    })
   })
 })
diff --git a/packages/server/src/integration-test/mysql.spec.ts b/packages/server/src/integration-test/mysql.spec.ts
index 04a2541ad6..dbfacca403 100644
--- a/packages/server/src/integration-test/mysql.spec.ts
+++ b/packages/server/src/integration-test/mysql.spec.ts
@@ -109,54 +109,6 @@ describe("mysql integrations", () => {
     })
   })
 
-  describe("POST /api/datasources/verify", () => {
-    it("should be able to verify the connection", async () => {
-      await config.api.datasource.verify(
-        {
-          datasource: rawDatasource,
-        },
-        {
-          body: {
-            connected: true,
-          },
-        }
-      )
-    })
-
-    it("should state an invalid datasource cannot connect", async () => {
-      await config.api.datasource.verify(
-        {
-          datasource: {
-            ...rawDatasource,
-            config: {
-              ...rawDatasource.config,
-              password: "wrongpassword",
-            },
-          },
-        },
-        {
-          body: {
-            connected: false,
-            error:
-              "Access denied for the specified user. User does not have the necessary privileges or the provided credentials are incorrect. Please verify the credentials, and ensure that the user has appropriate permissions.",
-          },
-        }
-      )
-    })
-  })
-
-  describe("POST /api/datasources/info", () => {
-    it("should fetch information about mysql datasource", async () => {
-      const primaryName = primaryMySqlTable.name
-      const response = await makeRequest("post", "/api/datasources/info", {
-        datasource: datasource,
-      })
-      expect(response.status).toBe(200)
-      expect(response.body.tableNames).toBeDefined()
-      expect(response.body.tableNames.indexOf(primaryName)).not.toBe(-1)
-    })
-  })
-
   describe("Integration compatibility with mysql search_path", () => {
     let datasource: Datasource, rawDatasource: Datasource
     const database = generator.guid()
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index ccf63d0820..3ba47cb5fb 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1035,54 +1035,6 @@ describe("postgres integrations", () => {
     })
   })
 
-  describe("POST /api/datasources/verify", () => {
-    it("should be able to verify the connection", async () => {
-      await config.api.datasource.verify(
-        {
-          datasource: await getDatasource(DatabaseName.POSTGRES),
-        },
-        {
-          body: {
-            connected: true,
-          },
-        }
-      )
-    })
-
-    it("should state an invalid datasource cannot connect", async () => {
-      const dbConfig = await getDatasource(DatabaseName.POSTGRES)
-      await config.api.datasource.verify(
-        {
-          datasource: {
-            ...dbConfig,
-            config: {
-              ...dbConfig.config,
-              password: "wrongpassword",
-            },
-          },
-        },
-        {
-          body: {
-            connected: false,
-            error: 'password authentication failed for user "postgres"',
-          },
-        }
-      )
-    })
-  })
-
-  describe("POST /api/datasources/info", () => {
-    it("should fetch information about postgres datasource", async () => {
-      const primaryName = primaryPostgresTable.name
-      const response = await makeRequest("post", "/api/datasources/info", {
-        datasource: datasource,
-      })
-      expect(response.status).toBe(200)
-      expect(response.body.tableNames).toBeDefined()
-      expect(response.body.tableNames.indexOf(primaryName)).not.toBe(-1)
-    })
-  })
-
   describe("POST /api/datasources/:datasourceId/schema", () => {
     let tableName: string
 
diff --git a/packages/server/src/tests/utilities/api/datasource.ts b/packages/server/src/tests/utilities/api/datasource.ts
index 780a7fc7a3..7908c689d0 100644
--- a/packages/server/src/tests/utilities/api/datasource.ts
+++ b/packages/server/src/tests/utilities/api/datasource.ts
@@ -6,6 +6,7 @@ import {
   UpdateDatasourceRequest,
   QueryJson,
   BuildSchemaFromSourceResponse,
+  FetchDatasourceInfoResponse,
 } from "@budibase/types"
 import { Expectations, TestAPI } from "./base"
 
@@ -83,4 +84,14 @@ export class DatasourceAPI extends TestAPI {
       }
     )
   }
+
+  info = async (datasource: Datasource, expectations?: Expectations) => {
+    return await this._post<FetchDatasourceInfoResponse>(
+      `/api/datasources/info`,
+      {
+        body: { datasource },
+        expectations,
+      }
+    )
+  }
 }

From a879b5814ab3191eb224bb49c3795d08b6eb7846 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 16:57:33 +0100
Subject: [PATCH 119/128] Making sure that columns get updated to allow
 nulls/disallow correctly, as well as making sure enums can be updated and
 autocolumn state can change.

---
 packages/server/src/integrations/utils/utils.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts
index 157bdba3bd..41e62f8975 100644
--- a/packages/server/src/integrations/utils/utils.ts
+++ b/packages/server/src/integrations/utils/utils.ts
@@ -280,12 +280,29 @@ function copyExistingPropsOver(
           utils.unreachable(existingColumnType)
       }
 
+      // copy the BB schema in case of special props
       if (shouldKeepSchema) {
+        const fetchedColumnDefinition: FieldSchema | undefined =
+          table.schema[key]
         table.schema[key] = {
           ...existingTableSchema[key],
           externalType:
             existingTableSchema[key].externalType ||
             table.schema[key]?.externalType,
+          autocolumn: !!fetchedColumnDefinition?.autocolumn,
+        } as FieldSchema
+        // check constraints which can be fetched from the DB (they could be updated)
+        if (fetchedColumnDefinition?.constraints) {
+          // inclusions are the enum values (select/options)
+          const fetchedInclusion = fetchedColumnDefinition.constraints.inclusion
+          const oldInclusion = table.schema[key].constraints?.inclusion
+          table.schema[key].constraints = {
+            ...table.schema[key].constraints,
+            presence: !!fetchedColumnDefinition.constraints?.presence,
+            inclusion: fetchedInclusion?.length
+              ? fetchedInclusion
+              : oldInclusion,
+          }
         }
       }
     }

From 9cd7c144f4d06f4d415f3effafa72f4df7681183 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 16:57:46 +0100
Subject: [PATCH 120/128] Adding test case.

---
 .../src/integration-test/postgres.spec.ts     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index ccf63d0820..9da56034d1 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1265,4 +1265,48 @@ describe("postgres integrations", () => {
       expect(JSON.parse(decoded)[0]).toBe("1111")
     })
   })
+
+  describe("check fetching null/not null table", () => {
+    beforeAll(async () => {
+      await rawQuery(
+        rawDatasource,
+        `CREATE TABLE nullableTable (
+          order_id SERIAL PRIMARY KEY,
+          order_number INT NOT NULL
+        );
+      `
+      )
+    })
+
+    it("should be able to change the table to allow nullable and refetch this", async () => {
+      const response = await makeRequest(
+        "post",
+        `/api/datasources/${datasource._id}/schema`
+      )
+      const entities = response.body.datasource.entities
+      expect(entities).toBeDefined()
+      const nullableTable = entities["nullabletable"]
+      expect(nullableTable).toBeDefined()
+      expect(nullableTable.schema["order_number"].constraints.presence).toEqual(
+        true
+      )
+      await rawQuery(
+        rawDatasource,
+        `ALTER TABLE nullableTable
+             ALTER COLUMN order_number DROP NOT NULL;
+        `
+      )
+      const responseAfter = await makeRequest(
+        "post",
+        `/api/datasources/${datasource._id}/schema`
+      )
+      const entitiesAfter = responseAfter.body.datasource.entities
+      expect(entitiesAfter).toBeDefined()
+      const nullableTableAfter = entitiesAfter["nullabletable"]
+      expect(nullableTableAfter).toBeDefined()
+      expect(
+        nullableTableAfter.schema["order_number"].constraints.presence
+      ).toEqual(false)
+    })
+  })
 })

From d2c273542d11c87009f66e7bc2b6f15c23196dfb Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 7 Jun 2024 17:02:23 +0100
Subject: [PATCH 121/128] Fix tests.

---
 .../server/src/integration-test/mysql.spec.ts | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/packages/server/src/integration-test/mysql.spec.ts b/packages/server/src/integration-test/mysql.spec.ts
index dbfacca403..4dff40b61d 100644
--- a/packages/server/src/integration-test/mysql.spec.ts
+++ b/packages/server/src/integration-test/mysql.spec.ts
@@ -4,13 +4,14 @@ import {
   MakeRequestResponse,
 } from "../api/routes/public/tests/utils"
 import * as setup from "../api/routes/tests/utilities"
-import { Datasource, FieldType, Table, TableSourceType } from "@budibase/types"
+import { Datasource, FieldType } from "@budibase/types"
 import {
   DatabaseName,
   getDatasource,
   rawQuery,
 } from "../integrations/tests/utils"
 import { generator } from "@budibase/backend-core/tests"
+import { tableForDatasource } from "../../src/tests/utilities/structures"
 // @ts-ignore
 fetch.mockSearch()
 
@@ -41,8 +42,7 @@ jest.mock("../websockets", () => ({
 describe("mysql integrations", () => {
   let makeRequest: MakeRequestResponse,
     rawDatasource: Datasource,
-    datasource: Datasource,
-    primaryMySqlTable: Table
+    datasource: Datasource
 
   beforeAll(async () => {
     await config.init()
@@ -54,38 +54,12 @@ describe("mysql integrations", () => {
     datasource = await config.api.datasource.create(rawDatasource)
   })
 
-  beforeEach(async () => {
-    primaryMySqlTable = await config.createTable({
-      name: uniqueTableName(),
-      type: "table",
-      primary: ["id"],
-      schema: {
-        id: {
-          name: "id",
-          type: FieldType.AUTO,
-          autocolumn: true,
-        },
-        name: {
-          name: "name",
-          type: FieldType.STRING,
-        },
-        description: {
-          name: "description",
-          type: FieldType.STRING,
-        },
-        value: {
-          name: "value",
-          type: FieldType.NUMBER,
-        },
-      },
-      sourceId: datasource._id,
-      sourceType: TableSourceType.EXTERNAL,
-    })
-  })
-
   afterAll(config.end)
 
   it("validate table schema", async () => {
+    // Creating a table so that `entities` is populated.
+    await config.api.table.save(tableForDatasource(datasource))
+
     const res = await makeRequest("get", `/api/datasources/${datasource._id}`)
 
     expect(res.status).toBe(200)

From 5de2dc838222c36fe2946b9c77e8867204eb2206 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 17:13:06 +0100
Subject: [PATCH 122/128] Some test updates to make the fetchSchema tableFilter
 prop usable.

---
 .../src/api/routes/tests/datasource.spec.ts   |  2 +-
 .../src/integration-test/postgres.spec.ts     | 95 ++++++++-----------
 .../src/tests/utilities/api/datasource.ts     | 15 ++-
 3 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index f2cea90675..9aa494eb14 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -341,7 +341,7 @@ describe("/datasources", () => {
       )
 
       const persisted = await config.api.datasource.get(datasourceId)
-      await config.api.datasource.fetchSchema(datasourceId)
+      await config.api.datasource.fetchSchema({ datasourceId })
 
       const updated = await config.api.datasource.get(datasourceId)
       const expected: Datasource = {
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 9da56034d1..99369202ec 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1097,12 +1097,11 @@ describe("postgres integrations", () => {
     it("recognises when a table has no primary key", async () => {
       await rawQuery(rawDatasource, `CREATE TABLE "${tableName}" (id SERIAL)`)
 
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
 
-      expect(response.body.errors).toEqual({
+      expect(response.errors).toEqual({
         [tableName]: "Table must have a primary key.",
       })
     })
@@ -1113,12 +1112,11 @@ describe("postgres integrations", () => {
         `CREATE TABLE "${tableName}" (_id SERIAL PRIMARY KEY) `
       )
 
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
 
-      expect(response.body.errors).toEqual({
+      expect(response.errors).toEqual({
         [tableName]: "Table contains invalid columns.",
       })
     })
@@ -1143,15 +1141,14 @@ describe("postgres integrations", () => {
       `
       )
 
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
 
-      const table = response.body.datasource.entities[tableName]
+      const table = response.datasource.entities?.[tableName]
 
       expect(table).toBeDefined()
-      expect(table.schema[enumColumnName].type).toEqual(FieldType.OPTIONS)
+      expect(table?.schema[enumColumnName].type).toEqual(FieldType.OPTIONS)
     })
   })
 
@@ -1215,20 +1212,16 @@ describe("postgres integrations", () => {
         rawDatasource,
         `CREATE TABLE "${schema2}".${repeated_table_name} (id2 SERIAL PRIMARY KEY, val2 TEXT);`
       )
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`,
-        {
-          tablesFilter: [repeated_table_name],
-        }
-      )
-      expect(response.status).toBe(200)
+
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+        tablesFilter: [repeated_table_name],
+      })
       expect(
-        response.body.datasource.entities[repeated_table_name].schema
+        response.datasource.entities?.[repeated_table_name].schema
       ).toBeDefined()
-      const schema =
-        response.body.datasource.entities[repeated_table_name].schema
-      expect(Object.keys(schema).sort()).toEqual(["id", "val1"])
+      const schema = response.datasource.entities?.[repeated_table_name].schema
+      expect(Object.keys(schema || {}).sort()).toEqual(["id", "val1"])
     })
   })
 
@@ -1246,16 +1239,14 @@ describe("postgres integrations", () => {
     })
 
     it("should handle binary columns", async () => {
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
-      expect(response.body).toBeDefined()
-      expect(response.body.datasource.entities).toBeDefined()
-      const table = response.body.datasource.entities["binarytable"]
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
+      expect(response.datasource.entities).toBeDefined()
+      const table = response.datasource.entities?.["binarytable"]
       expect(table).toBeDefined()
-      expect(table.schema.id.externalType).toBe("bytea")
-      const row = await config.api.row.save(table._id, {
+      expect(table?.schema.id.externalType).toBe("bytea")
+      const row = await config.api.row.save(table?._id!, {
         id: "1111",
         column1: "hello",
         column2: 222,
@@ -1279,33 +1270,31 @@ describe("postgres integrations", () => {
     })
 
     it("should be able to change the table to allow nullable and refetch this", async () => {
-      const response = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
-      const entities = response.body.datasource.entities
+      const response = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
+      const entities = response.datasource.entities
       expect(entities).toBeDefined()
-      const nullableTable = entities["nullabletable"]
+      const nullableTable = entities?.["nullabletable"]
       expect(nullableTable).toBeDefined()
-      expect(nullableTable.schema["order_number"].constraints.presence).toEqual(
-        true
-      )
+      expect(
+        nullableTable?.schema["order_number"].constraints?.presence
+      ).toEqual(true)
       await rawQuery(
         rawDatasource,
         `ALTER TABLE nullableTable
              ALTER COLUMN order_number DROP NOT NULL;
         `
       )
-      const responseAfter = await makeRequest(
-        "post",
-        `/api/datasources/${datasource._id}/schema`
-      )
-      const entitiesAfter = responseAfter.body.datasource.entities
+      const responseAfter = await config.api.datasource.fetchSchema({
+        datasourceId: datasource._id!,
+      })
+      const entitiesAfter = responseAfter.datasource.entities
       expect(entitiesAfter).toBeDefined()
-      const nullableTableAfter = entitiesAfter["nullabletable"]
+      const nullableTableAfter = entitiesAfter?.["nullabletable"]
       expect(nullableTableAfter).toBeDefined()
       expect(
-        nullableTableAfter.schema["order_number"].constraints.presence
+        nullableTableAfter?.schema["order_number"].constraints?.presence
       ).toEqual(false)
     })
   })
diff --git a/packages/server/src/tests/utilities/api/datasource.ts b/packages/server/src/tests/utilities/api/datasource.ts
index bb4c74093c..0dd50562f9 100644
--- a/packages/server/src/tests/utilities/api/datasource.ts
+++ b/packages/server/src/tests/utilities/api/datasource.ts
@@ -71,11 +71,20 @@ export class DatasourceAPI extends TestAPI {
     })
   }
 
-  fetchSchema = async (id: string, expectations?: Expectations) => {
+  fetchSchema = async (
+    {
+      datasourceId,
+      tablesFilter,
+    }: { datasourceId: string; tablesFilter?: string[] },
+    expectations?: Expectations
+  ) => {
     return await this._post<BuildSchemaFromSourceResponse>(
-      `/api/datasources/${id}/schema`,
+      `/api/datasources/${datasourceId}/schema`,
       {
-        expectations,
+        expectations: expectations,
+        body: {
+          tablesFilter: tablesFilter,
+        },
       }
     )
   }

From 14266be4e431115114d160a8956f567de4f91ee7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 17:26:45 +0100
Subject: [PATCH 123/128] Commenting why it does stuff.

---
 packages/server/src/integration-test/postgres.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 99369202ec..32d74e5c45 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1280,6 +1280,8 @@ describe("postgres integrations", () => {
       expect(
         nullableTable?.schema["order_number"].constraints?.presence
       ).toEqual(true)
+      // need to perform these calls raw to the DB so that the external state of the DB differs to what Budibase
+      // is aware of - therefore we can try to fetch and make sure BB updates correctly
       await rawQuery(
         rawDatasource,
         `ALTER TABLE nullableTable

From 3cc4b71561b0d93e8417edc5e6127f346ddae9ec Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 17:59:18 +0100
Subject: [PATCH 124/128] Fixing some issues highlighted by test case.

---
 .../src/api/routes/tests/datasource.spec.ts   |  7 ++++++-
 .../server/src/integrations/utils/utils.ts    | 20 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index f7838b1d39..8fa84ac05d 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -258,11 +258,12 @@ describe("/datasources", () => {
           })
         )
 
+        const stringName = "string"
         const fullSchema: {
           [type in SupportedSqlTypes]: FieldSchema & { type: type }
         } = {
           [FieldType.STRING]: {
-            name: "string",
+            name: stringName,
             type: FieldType.STRING,
             constraints: {
               presence: true,
@@ -353,6 +354,10 @@ describe("/datasources", () => {
                   ),
                   schema: Object.entries(table.schema).reduce<TableSchema>(
                     (acc, [fieldName, field]) => {
+                      // the constraint will be unset - as the DB doesn't recognise it as not null
+                      if (fieldName === stringName) {
+                        field.constraints = {}
+                      }
                       acc[fieldName] = expect.objectContaining({
                         ...field,
                       })
diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts
index 41e62f8975..b97782ce7e 100644
--- a/packages/server/src/integrations/utils/utils.ts
+++ b/packages/server/src/integrations/utils/utils.ts
@@ -289,19 +289,25 @@ function copyExistingPropsOver(
           externalType:
             existingTableSchema[key].externalType ||
             table.schema[key]?.externalType,
-          autocolumn: !!fetchedColumnDefinition?.autocolumn,
+          autocolumn: fetchedColumnDefinition?.autocolumn,
         } as FieldSchema
         // check constraints which can be fetched from the DB (they could be updated)
         if (fetchedColumnDefinition?.constraints) {
           // inclusions are the enum values (select/options)
-          const fetchedInclusion = fetchedColumnDefinition.constraints.inclusion
-          const oldInclusion = table.schema[key].constraints?.inclusion
+          const fetchedConstraints = fetchedColumnDefinition.constraints
+          const oldConstraints = table.schema[key].constraints
           table.schema[key].constraints = {
             ...table.schema[key].constraints,
-            presence: !!fetchedColumnDefinition.constraints?.presence,
-            inclusion: fetchedInclusion?.length
-              ? fetchedInclusion
-              : oldInclusion,
+            inclusion: fetchedConstraints.inclusion?.length
+              ? fetchedConstraints.inclusion
+              : oldConstraints?.inclusion,
+          }
+          // true or undefined - consistent with old API
+          if (fetchedConstraints.presence) {
+            table.schema[key].constraints!.presence =
+              fetchedConstraints.presence
+          } else if (oldConstraints?.presence === true) {
+            delete table.schema[key].constraints?.presence
           }
         }
       }

From 138f1d02b694ce6498967246a32c501d68698abd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 18:02:26 +0100
Subject: [PATCH 125/128] Hopefully final fix to test.

---
 packages/server/src/integration-test/postgres.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 32d74e5c45..ddd3447d0d 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1297,7 +1297,7 @@ describe("postgres integrations", () => {
       expect(nullableTableAfter).toBeDefined()
       expect(
         nullableTableAfter?.schema["order_number"].constraints?.presence
-      ).toEqual(false)
+      ).toBeUndefined()
     })
   })
 })

From 85ab9ed2ed356694817ad7f0bd3ba1266f9d6ae4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 18:09:48 +0100
Subject: [PATCH 126/128] Adding a try catch to log if something in the app
 migration queue fails to process.

---
 .../src/appMigrations/migrationsProcessor.ts  | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/server/src/appMigrations/migrationsProcessor.ts b/packages/server/src/appMigrations/migrationsProcessor.ts
index 8d119f3864..9945ce4f66 100644
--- a/packages/server/src/appMigrations/migrationsProcessor.ts
+++ b/packages/server/src/appMigrations/migrationsProcessor.ts
@@ -1,4 +1,4 @@
-import { context, locks } from "@budibase/backend-core"
+import { context, locks, logging } from "@budibase/backend-core"
 import { LockName, LockType } from "@budibase/types"
 
 import {
@@ -20,37 +20,42 @@ export async function processMigrations(
       resource: appId,
     },
     async () => {
-      await context.doInAppMigrationContext(appId, async () => {
-        let currentVersion = await getAppMigrationVersion(appId)
+      try {
+        await context.doInAppMigrationContext(appId, async () => {
+          let currentVersion = await getAppMigrationVersion(appId)
 
-        const pendingMigrations = migrations
-          .filter(m => m.id > currentVersion)
-          .sort((a, b) => a.id.localeCompare(b.id))
+          const pendingMigrations = migrations
+            .filter(m => m.id > currentVersion)
+            .sort((a, b) => a.id.localeCompare(b.id))
 
-        const migrationIds = migrations.map(m => m.id).sort()
+          const migrationIds = migrations.map(m => m.id).sort()
 
-        let index = 0
-        for (const { id, func } of pendingMigrations) {
-          const expectedMigration =
-            migrationIds[migrationIds.indexOf(currentVersion) + 1]
+          let index = 0
+          for (const { id, func } of pendingMigrations) {
+            const expectedMigration =
+              migrationIds[migrationIds.indexOf(currentVersion) + 1]
 
-          if (expectedMigration !== id) {
-            throw `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
+            if (expectedMigration !== id) {
+              throw `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
+            }
+
+            const counter = `(${++index}/${pendingMigrations.length})`
+            console.info(`Running migration ${id}... ${counter}`, {
+              migrationId: id,
+              appId,
+            })
+            await func()
+            await updateAppMigrationMetadata({
+              appId,
+              version: id,
+            })
+            currentVersion = id
           }
-
-          const counter = `(${++index}/${pendingMigrations.length})`
-          console.info(`Running migration ${id}... ${counter}`, {
-            migrationId: id,
-            appId,
-          })
-          await func()
-          await updateAppMigrationMetadata({
-            appId,
-            version: id,
-          })
-          currentVersion = id
-        }
-      })
+        })
+      } catch (err) {
+        logging.logAlert("Failed to run app migration", err)
+        throw err
+      }
     }
   )
 

From 67c6c156e388e58a23376e4a65f978b091307b03 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 18:31:40 +0100
Subject: [PATCH 127/128] Updating logging for app migration.

---
 .../src/appMigrations/migrationsProcessor.ts   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/appMigrations/migrationsProcessor.ts b/packages/server/src/appMigrations/migrationsProcessor.ts
index 9945ce4f66..0ca923230f 100644
--- a/packages/server/src/appMigrations/migrationsProcessor.ts
+++ b/packages/server/src/appMigrations/migrationsProcessor.ts
@@ -20,8 +20,8 @@ export async function processMigrations(
       resource: appId,
     },
     async () => {
-      try {
-        await context.doInAppMigrationContext(appId, async () => {
+      await context.doInAppMigrationContext(appId, async () => {
+        try {
           let currentVersion = await getAppMigrationVersion(appId)
 
           const pendingMigrations = migrations
@@ -36,7 +36,9 @@ export async function processMigrations(
               migrationIds[migrationIds.indexOf(currentVersion) + 1]
 
             if (expectedMigration !== id) {
-              throw `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
+              throw new Error(
+                `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
+              )
             }
 
             const counter = `(${++index}/${pendingMigrations.length})`
@@ -51,11 +53,11 @@ export async function processMigrations(
             })
             currentVersion = id
           }
-        })
-      } catch (err) {
-        logging.logAlert("Failed to run app migration", err)
-        throw err
-      }
+        } catch (err) {
+          logging.logAlert("Failed to run app migration", err)
+          throw err
+        }
+      })
     }
   )
 

From ee391b30d6178b89236a66b374333504ae2703ca Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 7 Jun 2024 22:50:06 +0100
Subject: [PATCH 128/128] Fixing an issue with multi-tenant app migration
 failures - the app migration context wasn't getting the tenant ID as needed.
 Also added some better logging as well as cleaning up the queues properly to
 remove these dud events.

---
 packages/backend-core/src/queue/queue.ts      |  1 +
 packages/server/src/appMigrations/index.ts    |  2 -
 .../src/appMigrations/migrationsProcessor.ts  | 80 ++++++++++---------
 packages/server/src/appMigrations/queue.ts    | 18 ++++-
 4 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 1838eed92f..f633d0885e 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -21,6 +21,7 @@ let cleanupInterval: NodeJS.Timeout
 async function cleanup() {
   for (let queue of QUEUES) {
     await queue.clean(CLEANUP_PERIOD_MS, "completed")
+    await queue.clean(CLEANUP_PERIOD_MS, "failed")
   }
 }
 
diff --git a/packages/server/src/appMigrations/index.ts b/packages/server/src/appMigrations/index.ts
index 8bd3ae7425..89c71ae26f 100644
--- a/packages/server/src/appMigrations/index.ts
+++ b/packages/server/src/appMigrations/index.ts
@@ -48,8 +48,6 @@ export async function checkMissingMigrations(
       },
       {
         jobId: `${appId}_${latestMigration}`,
-        removeOnComplete: true,
-        removeOnFail: true,
       }
     )
 
diff --git a/packages/server/src/appMigrations/migrationsProcessor.ts b/packages/server/src/appMigrations/migrationsProcessor.ts
index 0ca923230f..badd50f53c 100644
--- a/packages/server/src/appMigrations/migrationsProcessor.ts
+++ b/packages/server/src/appMigrations/migrationsProcessor.ts
@@ -12,54 +12,56 @@ export async function processMigrations(
   migrations: AppMigration[]
 ) {
   console.log(`Processing app migration for "${appId}"`)
-
-  await locks.doWithLock(
-    {
-      name: LockName.APP_MIGRATION,
-      type: LockType.AUTO_EXTEND,
-      resource: appId,
-    },
-    async () => {
-      await context.doInAppMigrationContext(appId, async () => {
+  // have to wrap in context, this gets the tenant from the app ID
+  await context.doInAppContext(appId, async () => {
+    await locks.doWithLock(
+      {
+        name: LockName.APP_MIGRATION,
+        type: LockType.AUTO_EXTEND,
+        resource: appId,
+      },
+      async () => {
         try {
-          let currentVersion = await getAppMigrationVersion(appId)
+          await context.doInAppMigrationContext(appId, async () => {
+            let currentVersion = await getAppMigrationVersion(appId)
 
-          const pendingMigrations = migrations
-            .filter(m => m.id > currentVersion)
-            .sort((a, b) => a.id.localeCompare(b.id))
+            const pendingMigrations = migrations
+              .filter(m => m.id > currentVersion)
+              .sort((a, b) => a.id.localeCompare(b.id))
 
-          const migrationIds = migrations.map(m => m.id).sort()
+            const migrationIds = migrations.map(m => m.id).sort()
 
-          let index = 0
-          for (const { id, func } of pendingMigrations) {
-            const expectedMigration =
-              migrationIds[migrationIds.indexOf(currentVersion) + 1]
+            let index = 0
+            for (const { id, func } of pendingMigrations) {
+              const expectedMigration =
+                migrationIds[migrationIds.indexOf(currentVersion) + 1]
 
-            if (expectedMigration !== id) {
-              throw new Error(
-                `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
-              )
+              if (expectedMigration !== id) {
+                throw new Error(
+                  `Migration ${id} could not run, update for "${id}" is running but ${expectedMigration} is expected`
+                )
+              }
+
+              const counter = `(${++index}/${pendingMigrations.length})`
+              console.info(`Running migration ${id}... ${counter}`, {
+                migrationId: id,
+                appId,
+              })
+              await func()
+              await updateAppMigrationMetadata({
+                appId,
+                version: id,
+              })
+              currentVersion = id
             }
-
-            const counter = `(${++index}/${pendingMigrations.length})`
-            console.info(`Running migration ${id}... ${counter}`, {
-              migrationId: id,
-              appId,
-            })
-            await func()
-            await updateAppMigrationMetadata({
-              appId,
-              version: id,
-            })
-            currentVersion = id
-          }
+          })
         } catch (err) {
           logging.logAlert("Failed to run app migration", err)
           throw err
         }
-      })
-    }
-  )
+      }
+    )
 
-  console.log(`App migration for "${appId}" processed`)
+    console.log(`App migration for "${appId}" processed`)
+  })
 }
diff --git a/packages/server/src/appMigrations/queue.ts b/packages/server/src/appMigrations/queue.ts
index 72bb2f9b12..9dbc732e82 100644
--- a/packages/server/src/appMigrations/queue.ts
+++ b/packages/server/src/appMigrations/queue.ts
@@ -1,9 +1,23 @@
-import { queue } from "@budibase/backend-core"
+import { queue, logging } from "@budibase/backend-core"
 import { Job } from "bull"
 import { MIGRATIONS } from "./migrations"
 import { processMigrations } from "./migrationsProcessor"
 
-const appMigrationQueue = queue.createQueue(queue.JobQueue.APP_MIGRATION)
+const MAX_ATTEMPTS = 3
+
+const appMigrationQueue = queue.createQueue(queue.JobQueue.APP_MIGRATION, {
+  jobOptions: {
+    attempts: MAX_ATTEMPTS,
+    removeOnComplete: true,
+    removeOnFail: true,
+  },
+  maxStalledCount: MAX_ATTEMPTS,
+  removeStalledCb: async (job: Job) => {
+    logging.logAlert(
+      `App migration failed, queue job ID: ${job.id} - reason: ${job.failedReason}`
+    )
+  },
+})
 appMigrationQueue.process(processMessage)
 
 async function processMessage(job: Job) {