From ddcb942852d677398b2733b4209e935af4977432 Mon Sep 17 00:00:00 2001 From: Maria <123465523+mariaremote@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:07:05 +0200 Subject: [PATCH 1/3] first changes to credentials --- .../AcuitySchedulingApi.credentials.ts | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts index 658a65e8ba838..8ceb1c021a43d 100644 --- a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts +++ b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts @@ -1,4 +1,9 @@ -import type { ICredentialType, INodeProperties } from 'n8n-workflow'; +import type { + ICredentialType, + INodeProperties, + IAuthenticateGeneric, + ICredentialTestRequest, +} from 'n8n-workflow'; export class AcuitySchedulingApi implements ICredentialType { name = 'acuitySchedulingApi'; @@ -22,4 +27,21 @@ export class AcuitySchedulingApi implements ICredentialType { default: '', }, ]; + + authenticate: IAuthenticateGeneric = { + type: 'generic', + properties: { + auth: { + username: '={{$credentials.username}}', + password: '={{$credentials.password}}', + }, + }, + }; + + test: ICredentialTestRequest = { + request: { + baseURL: 'https://acuityscheduling.com/api/v1', + url: '/appointments', + }, + }; } From 7198bed3070345f269fb156e43fbe19a88f5e4ae Mon Sep 17 00:00:00 2001 From: Maria <123465523+mariaremote@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:44:33 +0200 Subject: [PATCH 2/3] adds option to return decimals as numbers --- .../nodes/MySql/v2/actions/common.descriptions.ts | 10 ++++++++++ packages/nodes-base/nodes/MySql/v2/transport/index.ts | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts index 67a1eda87eb5f..12f8ffd2427ef 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts @@ -134,6 +134,16 @@ export const optionsCollection: INodeProperties = { show: { '/operation': ['select', 'executeQuery'] }, }, }, + { + displayName: 'Output Decimals as Numbers', + name: 'decimalNumbers', + type: 'boolean', + default: false, + description: 'Whether to output DECIMAL types as numbers instead of strings', + displayOptions: { + show: { '/operation': ['select', 'executeQuery'] }, + }, + }, { displayName: 'Priority', name: 'priority', diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts index cbb373a52436e..f9e50fcb8f6e2 100644 --- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts +++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts @@ -24,6 +24,7 @@ export async function createPool( password: credentials.password, multipleStatements: true, supportBigNumbers: true, + decimalNumbers: false, }; if (credentials.ssl) { @@ -55,6 +56,10 @@ export async function createPool( connectionOptions.bigNumberStrings = true; } + if (options?.decimalNumbers === true) { + connectionOptions.decimalNumbers = true; + } + if (!credentials.sshTunnel) { return mysql2.createPool(connectionOptions); } else { From 3344fda8e8ee0404182e87cb9d92d22a40563f82 Mon Sep 17 00:00:00 2001 From: Maria <123465523+mariaremote@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:57:02 +0200 Subject: [PATCH 3/3] Revert "first changes to credentials" This reverts commit ddcb942852d677398b2733b4209e935af4977432. --- .../AcuitySchedulingApi.credentials.ts | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts index 8ceb1c021a43d..658a65e8ba838 100644 --- a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts +++ b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts @@ -1,9 +1,4 @@ -import type { - ICredentialType, - INodeProperties, - IAuthenticateGeneric, - ICredentialTestRequest, -} from 'n8n-workflow'; +import type { ICredentialType, INodeProperties } from 'n8n-workflow'; export class AcuitySchedulingApi implements ICredentialType { name = 'acuitySchedulingApi'; @@ -27,21 +22,4 @@ export class AcuitySchedulingApi implements ICredentialType { default: '', }, ]; - - authenticate: IAuthenticateGeneric = { - type: 'generic', - properties: { - auth: { - username: '={{$credentials.username}}', - password: '={{$credentials.password}}', - }, - }, - }; - - test: ICredentialTestRequest = { - request: { - baseURL: 'https://acuityscheduling.com/api/v1', - url: '/appointments', - }, - }; }