Merge branch 'master' of github.com:Budibase/budibase into next

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.14",
+  "version": "0.8.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.14",
+    "@budibase/client": "^0.8.16",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.14",
+    "@budibase/string-templates": "^0.8.16",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -53,10 +53,13 @@
   $: required = !!field?.constraints?.presence || primaryDisplay
   $: uneditable =
     $tables.selected?._id === TableNames.USERS &&
-    UNEDITABLE_USER_FIELDS.includes(field.name)
+    UNEDITABLE_USER_FIELDS.includes(field.name) ||
+    (originalName && field.type === LINK_TYPE)
   $: invalid =
     (field.type === LINK_TYPE && !field.tableId) ||
-    Object.keys($tables.draft.schema).some(key => key === field.name)
+    Object.keys($tables.draft.schema).some(
+      key => key === field.name && key !== originalName
+    )
 
   // used to select what different options can be displayed for column type
   $: canBeSearched =
@@ -154,19 +157,22 @@
     if (!linkTable) {
       return null
     }
-    const thisName = truncate(table.name, { length: 15 }),
+    const thisName = truncate(table.name, { length: 14 }),
-      linkName = truncate(linkTable.name, { length: 15 })
+      linkName = truncate(linkTable.name, { length: 14 })
     return [
       {
         name: `Many ${thisName} rows → many ${linkName} rows`,
+        alt: `Many ${table.name} rows → many ${linkTable.name} rows`,
         value: RelationshipTypes.MANY_TO_MANY,
       },
       {
         name: `One ${linkName} row → many ${thisName} rows`,
+        alt: `One ${linkTable.name} rows → many ${table.name} rows`,
         value: RelationshipTypes.ONE_TO_MANY,
       },
       {
         name: `One ${thisName} row → many ${linkName} rows`,
+        alt: `One ${table.name} rows → many ${linkTable.name} rows`,
         value: RelationshipTypes.MANY_TO_ONE,
       },
     ]
@@ -259,13 +265,13 @@
       <div>
         <Label grey extraSmall>Define the relationship</Label>
         <div class="radio-buttons">
-          {#each relationshipOptions as { value, name }}
+          {#each relationshipOptions as { value, name, alt }}
             <Radio
               disabled={originalName}
               name="Relationship type"
               {value}
               bind:group={field.relationshipType}>
-              <div class="radio-button-labels">
+              <div class="radio-button-labels" title={alt}>
                 <label for={value}>{name.split('→')[0]}</label>
                 <label class="rel-type-center" for={value}>→</label>
                 <label for={value}>{name.split('→')[1]}</label>

packages/cli/package.json

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

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,15 +18,15 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.14",
+    "@budibase/string-templates": "^0.8.16",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.14",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
+    "@budibase/standard-components": "^0.8.16",
     "fs-extra": "^8.1.0",
     "jsdom": "^16.0.1",
     "postcss": "^8.2.9",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -80,8 +80,8 @@
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@budibase/auth": "^0.0.1",
-    "@budibase/client": "^0.8.14",
+    "@budibase/client": "^0.8.16",
-    "@budibase/string-templates": "^0.8.14",
+    "@budibase/string-templates": "^0.8.16",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -135,7 +135,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.14",
+    "@budibase/standard-components": "^0.8.16",
     "@jest/test-sequencer": "^24.8.0",
     "docker-compose": "^0.23.6",
     "electron": "10.1.3",

packages/server/src/integrations/microsoftSqlServer.js

@@ -37,6 +37,12 @@ const SCHEMA = {
     read: {
       type: "sql",
     },
+    update: {
+      type: "sql",
+    },
+    delete: {
+      type: "sql",
+    },
   },
 }
 
@@ -71,6 +77,28 @@ class SqlServerIntegration {
       throw err
     }
   }
+
+  async update(query) {
+    try {
+      await this.connect()
+      const response = await this.client.query(query.sql)
+      return response.recordset
+    } catch (err) {
+      console.error("Error querying MS SQL Server", err)
+      throw err
+    }
+  }
+
+  async delete(query) {
+    try {
+      await this.connect()
+      const response = await this.client.query(query.sql)
+      return response.recordset
+    } catch (err) {
+      console.error("Error querying MS SQL Server", err)
+      throw err
+    }
+  }
 }
 
 module.exports = {

packages/standard-components/package.json

@@ -31,7 +31,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.14",
+  "version": "0.8.16",
   "license": "MIT",
   "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
   "dependencies": {

packages/string-templates/package.json

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

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {