diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 86669845e6..3ca8a8131a 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -11,7 +11,7 @@ import { BuildSchemaErrors, InvalidColumns } from "../../constants" import { getIntegration } from "../../integrations" import { getDatasourceAndQuery } from "./row/utils" import { invalidateDynamicVariables } from "../../threads/utils" -import { db as dbCore, context, events, cache } from "@budibase/backend-core" +import { db as dbCore, context, events } from "@budibase/backend-core" import { UserCtx, Datasource, diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 284a6a6f55..56f78bb932 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -96,7 +96,6 @@ const SCHEMA: Integration = { class SqlServerIntegration extends Sql implements DatasourcePlus { private readonly config: MSSQLConfig private index: number = 0 - private readonly pool: sqlServer.ConnectionPool private client?: sqlServer.ConnectionPool public tables: Record = {} public schemaErrors: Record = {} @@ -114,17 +113,6 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { constructor(config: MSSQLConfig) { super(SqlClient.MS_SQL) this.config = config - const clientCfg = { - ...this.config, - port: +this.config, - options: { - encrypt: this.config.encrypt, - enableArithAbort: true, - }, - } - delete clientCfg.encrypt - - this.pool = new sqlServer.ConnectionPool(clientCfg) } async testConnection() { @@ -150,7 +138,19 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { async connect() { try { - this.client = await this.pool.connect() + const clientCfg = { + ...this.config, + port: +this.config, + options: { + encrypt: this.config.encrypt, + enableArithAbort: true, + }, + } + delete clientCfg.encrypt + + const pool = new sqlServer.ConnectionPool(clientCfg) + + this.client = await pool.connect() } catch (err: any) { if (err?.originalError?.errors?.length) { const messages = []