MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11082 from Budibase/fix/qa-core-fixes 

Further QA-core fixes
This commit is contained in:
Michael Drury 2023-06-30 12:42:58 +01:00 committed by GitHub
parent e17827e0d3 4428678ebd
commit d5f43a00c2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/server/src/integrations/microsoftSqlServer.ts
View File

@ -184,12 +184,13 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
async connect() { async connect() {
try { try {
const encrypt = this.config.encrypt // if encrypt is undefined, then default is to encrypt
const encrypt = this.config.encrypt === undefined || this.config.encrypt
const clientCfg: MSSQLConfig & sqlServer.config = { const clientCfg: MSSQLConfig & sqlServer.config = {
...this.config, ...this.config,
port: +this.config.port, port: +this.config.port,
options: { options: {
encrypt: encrypt, encrypt,
enableArithAbort: true, enableArithAbort: true,
}, },
} }

2
qa-core/src/integrations/external-schema/mssql.integration.spec.ts
View File

@ -5,7 +5,7 @@ import mssql from "../../../../packages/server/src/integrations/microsoftSqlServ
jest.unmock("mssql") jest.unmock("mssql")
describe("getExternalSchema", () => { describe("getExternalSchema", () => {
describe("postgres", () => { describe("mssql", () => {
let config: any let config: any
beforeAll(async () => { beforeAll(async () => {