From 122caf227cfda4af4bb18ebf5be263f0a9a0bc35 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 3 Feb 2021 08:12:58 +0000
Subject: [PATCH 1/2] fixing text wrap in handlebars

---
 .../automation/SetupPanel/GenericBindingPopover.svelte      | 6 ++++++
 .../components/design/PropertiesPanel/BindingPanel.svelte   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
index 4c85d3865d..3956e765ee 100644
--- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
@@ -167,7 +167,13 @@
   .binding__description {
     color: var(--grey-8);
     margin-top: 2px;
+    white-space: normal;
   }
+
+  pre {
+    white-space: normal;
+  }
+
   .binding__type {
     font-family: monospace;
     background-color: var(--grey-2);
diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index 941796d025..76dbdf229c 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -170,6 +170,11 @@
     border-width: 1px 0 1px 0;
   }
 
+  pre,
+  .description {
+    white-space: normal;
+  }
+
   li:hover {
     color: var(--ink);
     font-weight: 500;

From befb94aaa9f036212a4715ac7c3b5e1b426c8677 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 3 Feb 2021 08:20:21 +0000
Subject: [PATCH 2/2] fixes for mySQL and MSSQL non default ports

---
 .../server/src/integrations/microsoftSqlServer.js  |  5 +++++
 packages/server/src/integrations/mysql.js          | 14 ++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js
index b7713cf15b..c99f4ed39f 100644
--- a/packages/server/src/integrations/microsoftSqlServer.js
+++ b/packages/server/src/integrations/microsoftSqlServer.js
@@ -17,6 +17,11 @@ const SCHEMA = {
       type: FIELD_TYPES.STRING,
       default: "localhost",
     },
+    port: {
+      type: FIELD_TYPES.NUMBER,
+      required: false,
+      default: 1433,
+    },
     database: {
       type: FIELD_TYPES.STRING,
       default: "root",
diff --git a/packages/server/src/integrations/mysql.js b/packages/server/src/integrations/mysql.js
index f5ea1caaca..a6e6ce7afc 100644
--- a/packages/server/src/integrations/mysql.js
+++ b/packages/server/src/integrations/mysql.js
@@ -1,25 +1,31 @@
 const mysql = require("mysql")
+const { FIELD_TYPES } = require("./Integration")
 
 const SCHEMA = {
   docs: "https://github.com/mysqljs/mysql",
   datasource: {
     host: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "localhost",
       required: true,
     },
+    port: {
+      type: FIELD_TYPES.NUMBER,
+      default: 1433,
+      required: false,
+    },
     user: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "root",
       required: true,
     },
     password: {
-      type: "password",
+      type: FIELD_TYPES.PASSWORD,
       default: "root",
       required: true,
     },
     database: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       required: true,
     },
   },