Browse Source

fix mssql encryption option

master
Martin McKeaveney 5 years ago
parent
commit
09ce58aa95
  1. 7
      packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
  2. 1
      packages/server/src/integrations/Integration.js
  3. 8
      packages/server/src/integrations/microsoftSqlServer.js

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

1
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",

8
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)
}

Loading…
Cancel
Save