From 5d77ec76e3c47fe9f9d7f31fe6c03827685ec576 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Wed, 3 May 2023 18:45:21 +0300
Subject: [PATCH] fix(MySQL Node): Node should return date types as strings
 (#6169)

---
 packages/nodes-base/nodes/MySql/MySql.node.ts                 | 3 ++-
 packages/nodes-base/nodes/MySql/v2/actions/router.ts          | 2 ++
 .../nodes-base/nodes/MySql/v2/actions/versionDescription.ts   | 2 +-
 packages/nodes-base/nodes/MySql/v2/transport/index.ts         | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 1d055b5ee5a80..db80bf1ae8188 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -11,13 +11,14 @@ export class MySql extends VersionedNodeType {
 			name: 'mySql',
 			icon: 'file:mysql.svg',
 			group: ['input'],
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 			description: 'Get, add and update data in MySQL',
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new MySqlV1(baseDescription),
 			2: new MySqlV2(baseDescription),
+			2.1: new MySqlV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/router.ts b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
index 9aa57586720fe..88cc1a3d08475 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
@@ -19,6 +19,8 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 	const operation = this.getNodeParameter('operation', 0);
 	const nodeOptions = this.getNodeParameter('options', 0);
 
+	nodeOptions.nodeVersion = this.getNode().typeVersion;
+
 	const credentials = await this.getCredentials('mySql');
 
 	let sshClient: Client | undefined = undefined;
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
index fd12c75352f66..32cd487c7e639 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
@@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'mySql',
 	icon: 'file:mysql.svg',
 	group: ['input'],
-	version: 2,
+	version: [2, 2.1],
 	subtitle: '={{ $parameter["operation"] }}',
 	description: 'Get, add and update data in MySQL',
 	defaults: {
diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
index fd662c4b76a2b..af40aa5c82375 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -78,6 +78,10 @@ export async function createPool(
 		supportBigNumbers: true,
 	};
 
+	if (options?.nodeVersion && (options.nodeVersion as number) >= 2.1) {
+		connectionOptions.dateStrings = true;
+	}
+
 	if (options?.connectionLimit) {
 		connectionOptions.connectionLimit = options.connectionLimit as number;
 	}