From fce79cd0e95316509bad8ae25b37f7d45c6f11a5 Mon Sep 17 00:00:00 2001 From: Fludem Date: Mon, 1 Jan 2024 07:39:04 +0000 Subject: [PATCH] Delete SSL config if SSL is disabled on MySQL Driver Set SSL as disabled and delete empty object if no SSL details supplied --- packages/driver.mysql/src/extension.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/driver.mysql/src/extension.ts b/packages/driver.mysql/src/extension.ts index 943e22da..e9284a1d 100644 --- a/packages/driver.mysql/src/extension.ts +++ b/packages/driver.mysql/src/extension.ts @@ -71,7 +71,14 @@ export async function activate(extContext: vscode.ExtensionContext): Promise delete connInfo[p]); - + connInfo.mysqlOptions = connInfo.mysqlOptions || {}; + if (connInfo.mysqlOptions.enableSsl === 'Disabled') { + delete connInfo.mysqlOptions.ssl; + } + if (typeof connInfo.mysqlOptions.ssl === 'object' && Object.keys(connInfo.mysqlOptions.ssl).length === 0) { + connInfo.mysqlOptions.enableSsl = 'Disabled'; + delete connInfo.mysqlOptions.ssl; + } return connInfo; }, parseBeforeEditConnection: ({ connInfo }) => {