From 09ce58aa952978ac412c49f7b120d971d2c59b71 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 28 May 2021 11:55:28 +0100
Subject: [PATCH] fix mssql encryption option

---
 .../TableIntegrationMenu/IntegrationConfigForm.svelte     | 7 ++++++-
 packages/server/src/integrations/Integration.js           | 1 +
 packages/server/src/integrations/microsoftSqlServer.js    | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 575399ed7..4541052ac 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Label, Input, Layout } from "@budibase/bbui"
+  import { Label, Input, Layout, Toggle } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { capitalise } from "helpers"
 
@@ -16,6 +16,11 @@
           defaults={schema[configKey].default}
           bind:object={integration[configKey]}
         />
+      {:else if schema[configKey].type === "boolean"}
+        <div class="form-row">
+          <Label>{capitalise(configKey)}</Label>
+          <Toggle text="" bind:value={integration[configKey]} />
+        </div>
       {:else}
         <div class="form-row">
           <Label>{capitalise(configKey)}</Label>
diff --git a/packages/server/src/integrations/Integration.js b/packages/server/src/integrations/Integration.js
index 07d6d159b..345787a47 100644
--- a/packages/server/src/integrations/Integration.js
+++ b/packages/server/src/integrations/Integration.js
@@ -6,6 +6,7 @@ exports.QUERY_TYPES = {
 
 exports.FIELD_TYPES = {
   STRING: "string",
+  BOOLEAN: "boolean",
   NUMBER: "number",
   PASSWORD: "password",
   LIST: "list",
diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js
index 6f99d1014..05b92f181 100644
--- a/packages/server/src/integrations/microsoftSqlServer.js
+++ b/packages/server/src/integrations/microsoftSqlServer.js
@@ -31,6 +31,10 @@ const SCHEMA = {
       type: FIELD_TYPES.STRING,
       default: "root",
     },
+    encrypt: {
+      type: FIELD_TYPES.BOOLEAN,
+      default: true,
+    },
   },
   query: {
     create: {
@@ -51,6 +55,10 @@ const SCHEMA = {
 class SqlServerIntegration {
   constructor(config) {
     this.config = config
+    this.config.options = {
+      encrypt: this.config.encrypt,
+    }
+    delete this.config.encrypt
     if (!pool) {
       pool = new sqlServer.ConnectionPool(this.config)
     }