Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text

README.md

@@ -104,12 +104,14 @@ Budibase is made to scale. With Budibase, you can self-host on your own infrastr
 
 ## 🏁 Get started
 
-<img src="https://res.cloudinary.com/daog6scxm/image/upload/v1634808888/logo/deploy_npl9za.png" />
+<a href="https://docs.budibase.com/self-hosting/self-host"><img src="https://res.cloudinary.com/daog6scxm/image/upload/v1634808888/logo/deploy_npl9za.png" /></a>
 
-Deploy Budibase self-Hosted in your existing infrastructure, using Docker, Kubernetes, and Digital Ocean.
+Deploy Budibase self-hosted in your existing infrastructure, using Docker, Kubernetes, and Digital Ocean.
 Or use Budibase Cloud if you don't need to self-host, and would like to get started quickly.
 
-### [Get started with Budibase](https://budibase.com)
+### [Get started with self-hosting Budibase](https://docs.budibase.com/self-hosting/self-host)
+
+### [Get started with Budibase Cloud](https://budibase.com)
 
 
 <br /><br />

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/bbui/src/Form/Core/TextArea.svelte

@@ -13,6 +13,7 @@
     start: textarea.selectionStart,
     end: textarea.selectionEnd,
   })
+  export let align = null
 
   let focus = false
   let textarea
@@ -46,6 +47,7 @@
     bind:this={textarea}
     placeholder={placeholder || ""}
     class="spectrum-Textfield-input"
+    style={align ? `text-align: ${align}` : ""}
     {disabled}
     {id}
     on:focus={() => (focus = true)}

packages/bbui/src/Form/Core/TextField.svelte

@@ -12,6 +12,7 @@
   export let updateOnChange = true
   export let quiet = false
   export let dataCy
+  export let align
 
   const dispatch = createEventDispatcher()
   let focus = false
@@ -92,8 +93,9 @@
     on:input={onInput}
     on:keyup={updateValueOnEnter}
     {type}
-    inputmode={type === "number" ? "decimal" : "text"}
     class="spectrum-Textfield-input"
+    style={align ? `text-align: ${align};` : ""}
+    inputmode={type === "number" ? "decimal" : "text"}
   />
 </div>
 

packages/bbui/src/Table/InternalRenderer.svelte

@@ -8,9 +8,34 @@
     copyToClipboard(value)
   }
 
-  function copyToClipboard(value) {
+  const copyToClipboard = value => {
-    navigator.clipboard.writeText(value).then(() => {
+    return new Promise(res => {
-      notifications.success("Copied")
+      if (navigator.clipboard && window.isSecureContext) {
+        // Try using the clipboard API first
+        navigator.clipboard.writeText(value).then(res)
+      } else {
+        // Fall back to the textarea hack
+        let textArea = document.createElement("textarea")
+        textArea.value = value
+        textArea.style.position = "fixed"
+        textArea.style.left = "-9999px"
+        textArea.style.top = "-9999px"
+        document.body.appendChild(textArea)
+        textArea.focus()
+        textArea.select()
+        document.execCommand("copy")
+        textArea.remove()
+        res()
+      }
+    })
+      .then(() => {
+        notifications.success("Copied to clipboard")
+      })
+      .catch(() => {
+        notifications.error(
+          "Failed to copy to clipboard. Check the dev console for the value."
+        )
+        console.warn("Failed to copy the value", value)
       })
   }
 </script>

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -66,10 +66,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.7",
+    "@budibase/bbui": "^1.0.49-alpha.12",
-    "@budibase/client": "^1.0.49-alpha.7",
+    "@budibase/client": "^1.0.49-alpha.12",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.49-alpha.7",
+    "@budibase/string-templates": "^1.0.49-alpha.12",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/builderStore/store/frontend.js

@@ -65,6 +65,9 @@ export const getFrontendStore = () => {
   const store = writable({ ...INITIAL_FRONTEND_STATE })
 
   store.actions = {
+    reset: () => {
+      store.set({ ...INITIAL_FRONTEND_STATE })
+    },
     initialise: async pkg => {
       const { layouts, screens, application, clientLibPath } = pkg
       const components = await fetchComponentLibDefinitions(application.appId)

packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte

@@ -188,18 +188,17 @@
 {:else}
   <Body size="S"><i>No tables found.</i></Body>
 {/if}
-{#if plusTables?.length !== 0 && integration.relationships}
+<Divider size="S" />
-  <Divider size="S" />
+<div class="query-header">
-  <div class="query-header">
   <Heading size="S">Relationships</Heading>
-    <Button primary on:click={openRelationshipModal}>
+  <Button primary on:click={() => openRelationshipModal()}>
     Define relationship
   </Button>
-  </div>
+</div>
-  <Body>
+<Body>
   Tell budibase how your tables are related to get even more smart features.
-  </Body>
+</Body>
-  {#if relationshipInfo && relationshipInfo.length > 0}
+{#if relationshipInfo && relationshipInfo.length > 0}
   <Table
     on:click={({ detail }) => openRelationshipModal(detail.from, detail.to)}
     schema={relationshipSchema}
@@ -208,9 +207,8 @@
     allowEditRows={false}
     allowSelectRows={false}
   />
-  {:else}
+{:else}
   <Body size="S"><i>No relationships configured.</i></Body>
-  {/if}
 {/if}
 
 <style>

packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte

@@ -22,6 +22,10 @@
 
   let originalFromName = fromRelationship.name,
     originalToName = toRelationship.name
+  let fromTable, toTable, through, linkTable, tableOptions
+  let isManyToMany, isManyToOne, relationshipTypes
+  let errors, valid
+  let currentTables = {}
 
   if (fromRelationship && !fromRelationship.relationshipType) {
     fromRelationship.relationshipType = RelationshipTypes.MANY_TO_ONE
@@ -41,61 +45,52 @@
 
   const touched = writable({})
 
-  function checkForErrors(
+  function checkForErrors(fromRelate, toRelate) {
-    fromTable,
-    toTable,
-    throughTable,
-    fromRelate,
-    toRelate
-  ) {
     const isMany =
       fromRelate.relationshipType === RelationshipTypes.MANY_TO_MANY
     const tableNotSet = "Please specify a table"
-    const errors = {}
+    const errObj = {}
     if ($touched.from && !fromTable) {
-      errors.from = tableNotSet
+      errObj.from = tableNotSet
     }
     if ($touched.to && !toTable) {
-      errors.to = tableNotSet
+      errObj.to = tableNotSet
     }
     if ($touched.through && isMany && !fromRelate.through) {
-      errors.through = tableNotSet
+      errObj.through = tableNotSet
     }
     if ($touched.foreign && !isMany && !fromRelate.fieldName) {
-      errors.foreign = "Please pick the foreign key"
+      errObj.foreign = "Please pick the foreign key"
     }
     const colNotSet = "Please specify a column name"
     if ($touched.fromCol && !fromRelate.name) {
-      errors.fromCol = colNotSet
+      errObj.fromCol = colNotSet
     }
     if ($touched.toCol && !toRelate.name) {
-      errors.toCol = colNotSet
+      errObj.toCol = colNotSet
     }
     if ($touched.primary && !fromPrimary) {
-      errors.primary = "Please pick the primary key"
+      errObj.primary = "Please pick the primary key"
     }
     // currently don't support relationships back onto the table itself, needs to relate out
     const tableError = "From/to/through tables must be different"
-    if (fromTable && (fromTable === toTable || fromTable === throughTable)) {
+    if (fromTable && (fromTable === toTable || fromTable === through)) {
-      errors.from = tableError
+      errObj.from = tableError
     }
-    if (toTable && (toTable === fromTable || toTable === throughTable)) {
+    if (toTable && (toTable === fromTable || toTable === through)) {
-      errors.to = tableError
+      errObj.to = tableError
     }
-    if (
+    if (through && (through === fromTable || through === toTable)) {
-      throughTable &&
+      errObj.through = tableError
-      (throughTable === fromTable || throughTable === toTable)
-    ) {
-      errors.through = tableError
     }
     const colError = "Column name cannot be an existing column"
     if (inSchema(fromTable, fromRelate.name, originalFromName)) {
-      errors.fromCol = colError
+      errObj.fromCol = colError
     }
     if (inSchema(toTable, toRelate.name, originalToName)) {
-      errors.toCol = colError
+      errObj.toCol = colError
     }
-    return errors
+    errors = errObj
   }
 
   let fromPrimary
@@ -115,13 +110,7 @@
   $: fromTable = plusTables.find(table => table._id === toRelationship?.tableId)
   $: toTable = plusTables.find(table => table._id === fromRelationship?.tableId)
   $: through = plusTables.find(table => table._id === fromRelationship?.through)
-  $: errors = checkForErrors(
+  $: checkForErrors(fromRelationship, toRelationship)
-    fromTable,
-    toTable,
-    through,
-    fromRelationship,
-    toRelationship
-  )
   $: valid =
     Object.keys(errors).length === 0 && Object.keys($touched).length !== 0
   $: linkTable = through || toTable
@@ -239,19 +228,19 @@
   }
 
   function tableChanged(fromTbl, toTbl) {
+    if (
+      (currentTables?.from?._id === fromTbl?._id &&
+        currentTables?.to?._id === toTbl?._id) ||
+      originalFromName ||
+      originalToName
+    ) {
+      return
+    }
     fromRelationship.name = toTbl?.name || ""
     errors.fromCol = ""
     toRelationship.name = fromTbl?.name || ""
     errors.toCol = ""
-    if (toTbl || fromTbl) {
+    currentTables = { from: fromTbl, to: toTbl }
-      checkForErrors(
-        fromTable,
-        toTable,
-        through,
-        fromRelationship,
-        toRelationship
-      )
-    }
   }
 </script>
 

packages/builder/src/components/integration/AccessLevelSelect.svelte

@@ -26,6 +26,7 @@
 
   async function getPermissions(queryToFetch) {
     if (fetched?._id === queryToFetch?._id) {
+      loaded = true
       return
     }
     fetched = queryToFetch

packages/builder/src/pages/builder/app/[application]/_layout.svelte

@@ -12,7 +12,7 @@
   import Logo from "assets/bb-emblem.svg"
   import { capitalise } from "helpers"
   import UpgradeModal from "../../../../components/upgrade/UpgradeModal.svelte"
-  import { onMount } from "svelte"
+  import { onMount, onDestroy } from "svelte"
 
   // Get Package and set store
   export let application
@@ -81,6 +81,10 @@
       hasSynced = true
     }
   })
+
+  onDestroy(() => {
+    store.actions.reset()
+  })
 </script>
 
 {#await promise}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/cli/yarn.lock

@@ -1583,9 +1583,9 @@ simple-concat@^1.0.0:
   integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
 
 simple-get@^3.0.3:
-  version "3.1.0"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
+  integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==
   dependencies:
     decompress-response "^4.2.0"
     once "^1.3.1"

packages/client/manifest.json

@@ -1942,6 +1942,35 @@
         "type": "validation/string",
         "label": "Validation",
         "key": "validation"
+      },
+      {
+        "type": "select",
+        "label": "Alignment",
+        "key": "align",
+        "defaultValue": "left",
+        "showInBar": true,
+        "barStyle": "buttons",
+        "options": [{
+          "label": "Left",
+          "value": "left",
+          "barIcon": "TextAlignLeft",
+          "barTitle": "Align left"
+        }, {
+          "label": "Center",
+          "value": "center",
+          "barIcon": "TextAlignCenter",
+          "barTitle": "Align center"
+        }, {
+          "label": "Right",
+          "value": "right",
+          "barIcon": "TextAlignRight",
+          "barTitle": "Align right"
+        }, {
+          "label": "Justify",
+          "value": "justify",
+          "barIcon": "TextAlignJustify",
+          "barTitle": "Justify text"
+        }]
       }
     ]
   },
@@ -2478,6 +2507,11 @@
         "label": "Placeholder",
         "key": "placeholder"
       },
+      {
+        "type": "text",
+        "label": "Default value",
+        "key": "defaultValue"
+      },
       {
         "type": "boolean",
         "label": "Autocomplete",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.7",
+    "@budibase/bbui": "^1.0.49-alpha.12",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.49-alpha.7",
+    "@budibase/string-templates": "^1.0.49-alpha.12",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",

packages/client/src/components/app/forms/RelationshipField.svelte

@@ -12,6 +12,7 @@
   export let disabled = false
   export let validation
   export let autocomplete = false
+  export let defaultValue
 
   let fieldState
   let fieldApi
@@ -27,6 +28,7 @@
   $: singleValue = flatten(fieldState?.value)?.[0]
   $: multiValue = flatten(fieldState?.value) ?? []
   $: component = multiselect ? CoreMultiselect : CoreSelect
+  $: expandedDefaultValue = expand(defaultValue)
 
   const fetchTable = async id => {
     if (id) {
@@ -62,6 +64,16 @@
   const multiHandler = e => {
     fieldApi.setValue(e.detail)
   }
+
+  const expand = values => {
+    if (!values) {
+      return []
+    }
+    if (Array.isArray(values)) {
+      return values
+    }
+    return values.split(",").map(value => value.trim())
+  }
 </script>
 
 <Field
@@ -69,11 +81,11 @@
   {field}
   {disabled}
   {validation}
+  defaultValue={expandedDefaultValue}
   type={FieldTypes.LINK}
   bind:fieldState
   bind:fieldApi
   bind:fieldSchema
-  defaultValue={[]}
 >
   {#if fieldState}
     <svelte:component

packages/client/src/components/app/forms/StringField.svelte

@@ -9,6 +9,7 @@
   export let disabled = false
   export let validation
   export let defaultValue = ""
+  export let align
 
   let fieldState
   let fieldApi
@@ -34,6 +35,7 @@
       id={fieldState.fieldId}
       {placeholder}
       {type}
+      {align}
     />
   {/if}
 </Field>

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.49-alpha.7",
+    "@budibase/backend-core": "^1.0.49-alpha.12",
-    "@budibase/client": "^1.0.49-alpha.7",
+    "@budibase/client": "^1.0.49-alpha.12",
-    "@budibase/string-templates": "^1.0.49-alpha.7",
+    "@budibase/string-templates": "^1.0.49-alpha.12",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/scripts/integrations/postgres/init.sql

@@ -9,11 +9,15 @@ CREATE TABLE Persons (
 );
 CREATE TABLE Tasks (
     TaskID SERIAL PRIMARY KEY,
-    PersonID INT,
+    ExecutorID INT,
+    QaID INT,
     Completed BOOLEAN,
     TaskName varchar(255),
-    CONSTRAINT fkPersons
+    CONSTRAINT fkexecutor
-        FOREIGN KEY(PersonID)
+        FOREIGN KEY(ExecutorID)
+            REFERENCES Persons(PersonID),
+    CONSTRAINT fkqa
+        FOREIGN KEY(QaID)
 	    REFERENCES Persons(PersonID)
 );
 CREATE TABLE Products (
@@ -32,8 +36,9 @@ CREATE TABLE Products_Tasks (
     PRIMARY KEY (ProductID, TaskID)
 );
 INSERT INTO Persons (FirstName, LastName, Address, City) VALUES ('Mike', 'Hughes', '123 Fake Street', 'Belfast');
-INSERT INTO Tasks (PersonID, TaskName, Completed) VALUES (1, 'assembling', TRUE);
+INSERT INTO Persons (FirstName, LastName, Address, City) Values ('John', 'Smith', '64 Updown Road', 'Dublin');
-INSERT INTO Tasks (PersonID, TaskName, Completed) VALUES (1, 'processing', FALSE);
+INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (1, 2, 'assembling', TRUE);
+INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (2, 1, 'processing', FALSE);
 INSERT INTO Products (ProductName) VALUES ('Computers');
 INSERT INTO Products (ProductName) VALUES ('Laptops');
 INSERT INTO Products (ProductName) VALUES ('Chairs');

packages/server/src/api/controllers/row/ExternalRequest.ts

@@ -184,7 +184,7 @@ module External {
     thisRow._id = generateIdForRow(row, table)
     thisRow.tableId = table._id
     thisRow._rev = "rev"
-    return thisRow
+    return processFormulas(table, thisRow)
   }
 
   function fixArrayTypes(row: Row, table: Table) {
@@ -327,8 +327,12 @@ module External {
      * This iterates through the returned rows and works out what elements of the rows
      * actually match up to another row (based on primary keys) - this is pretty specific
      * to SQL and the way that SQL relationships are returned based on joins.
+     * This is complicated, but the idea is that when a SQL query returns all the relations
+     * will be separate rows, with all of the data in each row. We have to decipher what comes
+     * from where (which tables) and how to convert that into budibase columns.
      */
     updateRelationshipColumns(
+      table: Table,
       row: Row,
       rows: { [key: string]: Row },
       relationships: RelationshipsJson[]
@@ -339,6 +343,13 @@ module External {
         if (!linkedTable) {
           continue
         }
+        const fromColumn = `${table.name}.${relationship.from}`
+        const toColumn = `${linkedTable.name}.${relationship.to}`
+        // this is important when working with multiple relationships
+        // between the same tables, don't want to overlap/multiply the relations
+        if (!relationship.through && row[fromColumn] !== row[toColumn]) {
+          continue
+        }
         let linked = basicProcessing(row, linkedTable)
         if (!linked._id) {
           continue
@@ -386,6 +397,7 @@ module External {
         // this is a relationship of some sort
         if (finalRows[rowId]) {
           finalRows = this.updateRelationshipColumns(
+            table,
             row,
             finalRows,
             relationships
@@ -399,6 +411,7 @@ module External {
         finalRows[thisRow._id] = thisRow
         // do this at end once its been added to the final rows
         finalRows = this.updateRelationshipColumns(
+          table,
           row,
           finalRows,
           relationships

packages/server/src/api/controllers/row/external.js

@@ -31,23 +31,21 @@ async function handleRequest(operation, tableId, opts = {}) {
 exports.handleRequest = handleRequest
 
 exports.patch = async ctx => {
-  const appId = ctx.appId
   const inputs = ctx.request.body
   const tableId = ctx.params.tableId
   const id = breakRowIdField(inputs._id)
   // don't save the ID to db
   delete inputs._id
-  return handleRequest(appId, DataSourceOperation.UPDATE, tableId, {
+  return handleRequest(DataSourceOperation.UPDATE, tableId, {
     id,
     row: inputs,
   })
 }
 
 exports.save = async ctx => {
-  const appId = ctx.appId
   const inputs = ctx.request.body
   const tableId = ctx.params.tableId
-  return handleRequest(appId, DataSourceOperation.CREATE, tableId, {
+  return handleRequest(DataSourceOperation.CREATE, tableId, {
     row: inputs,
   })
 }
@@ -61,49 +59,35 @@ exports.fetchView = async ctx => {
 }
 
 exports.fetch = async ctx => {
-  const appId = ctx.appId
   const tableId = ctx.params.tableId
-  return handleRequest(appId, DataSourceOperation.READ, tableId)
+  return handleRequest(DataSourceOperation.READ, tableId)
 }
 
 exports.find = async ctx => {
-  const appId = ctx.appId
   const id = ctx.params.rowId
   const tableId = ctx.params.tableId
-  const response = await handleRequest(
+  const response = await handleRequest(DataSourceOperation.READ, tableId, {
-    appId,
-    DataSourceOperation.READ,
-    tableId,
-    {
     id,
-    }
+  })
-  )
   return response ? response[0] : response
 }
 
 exports.destroy = async ctx => {
-  const appId = ctx.appId
   const tableId = ctx.params.tableId
   const id = ctx.request.body._id
-  const { row } = await handleRequest(
+  const { row } = await handleRequest(DataSourceOperation.DELETE, tableId, {
-    appId,
-    DataSourceOperation.DELETE,
-    tableId,
-    {
     id,
-    }
+  })
-  )
   return { response: { ok: true }, row }
 }
 
 exports.bulkDestroy = async ctx => {
-  const appId = ctx.appId
   const { rows } = ctx.request.body
   const tableId = ctx.params.tableId
   let promises = []
   for (let row of rows) {
     promises.push(
-      handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+      handleRequest(DataSourceOperation.DELETE, tableId, {
         id: breakRowIdField(row._id),
       })
     )
@@ -113,7 +97,6 @@ exports.bulkDestroy = async ctx => {
 }
 
 exports.search = async ctx => {
-  const appId = ctx.appId
   const tableId = ctx.params.tableId
   const { paginate, query, ...params } = ctx.request.body
   let { bookmark, limit } = params
@@ -143,26 +126,21 @@ exports.search = async ctx => {
       [params.sort]: direction,
     }
   }
-  const rows = await handleRequest(appId, DataSourceOperation.READ, tableId, {
+  const rows = await handleRequest(DataSourceOperation.READ, tableId, {
     filters: query,
     sort,
     paginate: paginateObj,
   })
   let hasNextPage = false
   if (paginate && rows.length === limit) {
-    const nextRows = await handleRequest(
+    const nextRows = await handleRequest(DataSourceOperation.READ, tableId, {
-      appId,
-      DataSourceOperation.READ,
-      tableId,
-      {
       filters: query,
       sort,
       paginate: {
         limit: 1,
         page: bookmark * limit + 1,
       },
-      }
+    })
-    )
     hasNextPage = nextRows.length > 0
   }
   // need wrapper object for bookmarks etc when paginating
@@ -175,7 +153,6 @@ exports.validate = async () => {
 }
 
 exports.fetchEnrichedRow = async ctx => {
-  const appId = ctx.appId
   const id = ctx.params.rowId
   const tableId = ctx.params.tableId
   const { datasourceId, tableName } = breakExternalTableId(tableId)
@@ -185,15 +162,10 @@ exports.fetchEnrichedRow = async ctx => {
     ctx.throw(400, "Datasource has not been configured for plus API.")
   }
   const tables = datasource.entities
-  const response = await handleRequest(
+  const response = await handleRequest(DataSourceOperation.READ, tableId, {
-    appId,
-    DataSourceOperation.READ,
-    tableId,
-    {
     id,
     datasource,
-    }
+  })
-  )
   const table = tables[tableName]
   const row = response[0]
   // this seems like a lot of work, but basically we need to dig deeper for the enrich
@@ -212,7 +184,6 @@ exports.fetchEnrichedRow = async ctx => {
     // don't support composite keys right now
     const linkedIds = links.map(link => breakRowIdField(link._id)[0])
     row[fieldName] = await handleRequest(
-      appId,
       DataSourceOperation.READ,
       linkedTableId,
       {

packages/server/src/integrations/base/sql.ts

@@ -191,29 +191,70 @@ class InternalBuilder {
     if (!relationships) {
       return query
     }
+    const tableSets: Record<string, [any]> = {}
+    // aggregate into table sets (all the same to tables)
+    for (let relationship of relationships) {
+      const keyObj: { toTable: string; throughTable: string | undefined } = {
+        toTable: relationship.tableName,
+        throughTable: undefined,
+      }
+      if (relationship.through) {
+        keyObj.throughTable = relationship.through
+      }
+      const key = JSON.stringify(keyObj)
+      if (tableSets[key]) {
+        tableSets[key].push(relationship)
+      } else {
+        tableSets[key] = [relationship]
+      }
+    }
+    for (let [key, relationships] of Object.entries(tableSets)) {
+      const { toTable, throughTable } = JSON.parse(key)
+      if (!throughTable) {
+        // @ts-ignore
+        query = query.join(
+          toTable,
+          function () {
             for (let relationship of relationships) {
               const from = relationship.from,
-        to = relationship.to,
+                to = relationship.to
-        toTable = relationship.tableName
-      if (!relationship.through) {
               // @ts-ignore
-        query = query.leftJoin(
+              this.orOn(`${fromTable}.${from}`, "=", `${toTable}.${to}`)
-          toTable,
+            }
-          `${fromTable}.${from}`,
+          },
-          `${toTable}.${to}`
+          "left"
         )
       } else {
-        const throughTable = relationship.through
-        const fromPrimary = relationship.fromPrimary
-        const toPrimary = relationship.toPrimary
         query = query
           // @ts-ignore
-          .leftJoin(
+          .join(
             throughTable,
+            function () {
+              for (let relationship of relationships) {
+                const fromPrimary = relationship.fromPrimary
+                const from = relationship.from
+                // @ts-ignore
+                this.orOn(
                   `${fromTable}.${fromPrimary}`,
+                  "=",
                   `${throughTable}.${from}`
                 )
-          .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`)
+              }
+            },
+            "left"
+          )
+          .join(
+            toTable,
+            function () {
+              for (let relationship of relationships) {
+                const toPrimary = relationship.toPrimary
+                const to = relationship.to
+                // @ts-ignore
+                this.orOn(`${toTable}.${toPrimary}`, `${throughTable}.${to}`)
+              }
+            },
+            "left"
+          )
       }
     }
     return query.limit(BASE_LIMIT)

packages/server/src/threads/query.js

@@ -5,9 +5,6 @@ const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/)
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/)
-
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
     this.datasource = input.datasource
@@ -188,12 +185,8 @@ class QueryRunner {
         enrichedQuery[key] = this.enrichQueryFields(fields[key], parameters)
       } else if (typeof fields[key] === "string") {
         // enrich string value as normal
-        let value = fields[key]
+        enrichedQuery[key] = processStringSync(fields[key], parameters, {
-        // add triple brace to avoid escaping e.g. '=' in cookie header
+          noEscaping: true,
-        if (IS_HANDLEBARS.test(value) && !IS_TRIPLE_BRACE.test(value)) {
-          value = `{${value}}`
-        }
-        enrichedQuery[key] = processStringSync(value, parameters, {
           noHelpers: true,
         })
       } else {

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/string-templates/src/index.cjs

@@ -17,6 +17,7 @@ module.exports.processString = templates.processString
 module.exports.processObject = templates.processObject
 module.exports.doesContainStrings = templates.doesContainStrings
 module.exports.doesContainString = templates.doesContainString
+module.exports.disableEscaping = templates.disableEscaping
 
 /**
  * Use vm2 to run JS scripts in a node env

packages/string-templates/src/index.js

@@ -3,12 +3,12 @@ const { registerAll } = require("./helpers/index")
 const processors = require("./processors")
 const { atob, btoa } = require("./utilities")
 const manifest = require("../manifest.json")
-const { FIND_HBS_REGEX } = require("./utilities")
+const { FIND_HBS_REGEX, FIND_DOUBLE_HBS_REGEX } = require("./utilities")
 
 const hbsInstance = handlebars.create()
 registerAll(hbsInstance)
 const hbsInstanceNoHelpers = handlebars.create()
-const defaultOpts = { noHelpers: false }
+const defaultOpts = { noHelpers: false, noEscaping: false }
 
 /**
  * utility function to check if the object is valid
@@ -27,7 +27,7 @@ function testObject(object) {
  * @param {object|array} object The input structure which is to be recursed, it is important to note that
  * if the structure contains any cycles then this will fail.
  * @param {object} context The context that handlebars should fill data from.
- * @param {object|null} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {Promise<object|array>} The structure input, as fully updated as possible.
  */
 module.exports.processObject = async (object, context, opts) => {
@@ -58,7 +58,7 @@ module.exports.processObject = async (object, context, opts) => {
  * then nothing will occur.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object|null} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {Promise<string>} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processString = async (string, context, opts) => {
@@ -72,7 +72,7 @@ module.exports.processString = async (string, context, opts) => {
  * @param {object|array} object The input structure which is to be recursed, it is important to note that
  * if the structure contains any cycles then this will fail.
  * @param {object} context The context that handlebars should fill data from.
- * @param {object|null} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {object|array} The structure input, as fully updated as possible.
  */
 module.exports.processObjectSync = (object, context, opts) => {
@@ -93,7 +93,7 @@ module.exports.processObjectSync = (object, context, opts) => {
  * then nothing will occur. This is a pure sync call and therefore does not have the full functionality of the async call.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object|null} opts optional - specify some options for processing.
+ * @param {object|undefined} opts optional - specify some options for processing.
  * @returns {string} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processStringSync = (string, context, opts) => {
@@ -110,7 +110,9 @@ module.exports.processStringSync = (string, context, opts) => {
     string = processors.preprocess(string, shouldFinalise)
     // this does not throw an error when template can't be fulfilled, have to try correct beforehand
     const instance = opts.noHelpers ? hbsInstanceNoHelpers : hbsInstance
-    const template = instance.compile(string, {
+    const templateString =
+      opts && opts.noEscaping ? exports.disableEscaping(string) : string
+    const template = instance.compile(templateString, {
       strict: false,
     })
     const now = Math.floor(Date.now() / 1000) * 1000
@@ -125,6 +127,24 @@ module.exports.processStringSync = (string, context, opts) => {
   }
 }
 
+/**
+ * By default with expressions like {{ name }} handlebars will escape various
+ * characters, which can be problematic. To fix this we use the syntax {{{ name }}},
+ * this function will find any double braces and switch to triple.
+ * @param string the string to have double HBS statements converted to triple.
+ */
+module.exports.disableEscaping = string => {
+  let regexp = new RegExp(FIND_DOUBLE_HBS_REGEX)
+  const matches = string.match(regexp)
+  if (matches == null) {
+    return string
+  }
+  for (let match of matches) {
+    string = string.replace(match, `{${match}}`)
+  }
+  return string
+}
+
 /**
  * Simple utility function which makes sure that a templating property has been wrapped in literal specifiers correctly.
  * @param {string} property The property which is to be wrapped.

packages/string-templates/src/index.mjs

@@ -17,6 +17,7 @@ export const processString = templates.processString
 export const processObject = templates.processObject
 export const doesContainStrings = templates.doesContainStrings
 export const doesContainString = templates.doesContainString
+export const disableEscaping = templates.disableEscaping
 
 /**
  * Use polyfilled vm to run JS scripts in a browser Env

packages/string-templates/src/utilities.js

@@ -1,6 +1,7 @@
 const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g
 
 module.exports.FIND_HBS_REGEX = /{{([^{].*?)}}/g
+module.exports.FIND_DOUBLE_HBS_REGEX = /(?<!{){{[^{}]+}}(?!})/g
 
 module.exports.isAlphaNumeric = char => {
   return char.match(ALPHA_NUMERIC_REGEX)

packages/string-templates/test/basic.spec.js

@@ -6,6 +6,7 @@ const {
   getManifest,
   encodeJSBinding,
   doesContainString,
+  disableEscaping,
 } = require("../src/index.cjs")
 
 describe("Test that the string processing works correctly", () => {
@@ -176,3 +177,22 @@ describe("check does contain string function", () => {
     expect(doesContainString(js, "foo")).toEqual(true)
   })
 })
+
+describe("check that disabling escaping function works", () => {
+  it("should work for a single statement", () => {
+    expect(disableEscaping("{{ name }}")).toEqual("{{{ name }}}")
+  })
+
+  it("should work for two statements", () => {
+    expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+  })
+
+  it("shouldn't convert triple braces", () => {
+    expect(disableEscaping("{{{ name }}}")).toEqual("{{{ name }}}")
+  })
+
+  it("should work with a combination", () => {
+    expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+  })
+})
+

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.7",
+  "version": "1.0.49-alpha.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.49-alpha.7",
+    "@budibase/backend-core": "^1.0.49-alpha.12",
-    "@budibase/string-templates": "^1.0.49-alpha.7",
+    "@budibase/string-templates": "^1.0.49-alpha.12",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",