From e8d77aea475edc5b222bc72d81f2cc6b7f7b8efb Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Sun, 7 Mar 2021 08:02:26 -0500 Subject: [PATCH] :zap: Add connection timeout to credentials (MSSQL Node) (#1517) --- .../credentials/MicrosoftSql.credentials.ts | 7 ++ .../nodes/Microsoft/Sql/MicrosoftSql.node.ts | 19 ++- .../nodes-base/nodes/Microsoft/Sql/mssql.png | Bin 3447 -> 0 bytes .../nodes-base/nodes/Microsoft/Sql/mssql.svg | 115 ++++++++++++++++++ 4 files changed, 136 insertions(+), 5 deletions(-) delete mode 100644 packages/nodes-base/nodes/Microsoft/Sql/mssql.png create mode 100644 packages/nodes-base/nodes/Microsoft/Sql/mssql.svg diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts index 1b14ec577..01b075b5c 100644 --- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts +++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts @@ -50,5 +50,12 @@ export class MicrosoftSql implements ICredentialType { type: 'boolean' as NodePropertyTypes, default: true, }, + { + displayName: 'Connect Timeout', + name: 'connectTimeout', + type: 'number' as NodePropertyTypes, + default: 15000, + description: 'Connection timeout in ms.', + }, ]; } diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts index 39516f94f..16fdcce1d 100644 --- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts @@ -1,4 +1,7 @@ -import { IExecuteFunctions } from 'n8n-core'; +import { + IExecuteFunctions, +} from 'n8n-core'; + import { IDataObject, INodeExecutionData, @@ -6,11 +9,16 @@ import { INodeTypeDescription, } from 'n8n-workflow'; -import { chunk, flatten } from '../../utils/utilities'; +import { + chunk, + flatten, +} from '../../utils/utilities'; import * as mssql from 'mssql'; -import { ITables } from './TableInterface'; +import { + ITables, +} from './TableInterface'; import { copyInputItem, @@ -26,13 +34,13 @@ export class MicrosoftSql implements INodeType { description: INodeTypeDescription = { displayName: 'Microsoft SQL', name: 'microsoftSql', - icon: 'file:mssql.png', + icon: 'file:mssql.svg', group: ['input'], version: 1, description: 'Gets, add and update data in Microsoft SQL.', defaults: { name: 'Microsoft SQL', - color: '#1d4bab', + color: '#bcbcbd', }, inputs: ['main'], outputs: ['main'], @@ -217,6 +225,7 @@ export class MicrosoftSql implements INodeType { user: credentials.user as string, password: credentials.password as string, domain: credentials.domain ? (credentials.domain as string) : undefined, + connectTimeout: credentials.connectTimeout as number, options: { encrypt: credentials.tls as boolean, }, diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.png b/packages/nodes-base/nodes/Microsoft/Sql/mssql.png deleted file mode 100644 index 18349dc1cc58adfd3e724c264f96d2e3546b4474..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3447 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 SQGp*wkb$m=PRUKXu>S$oUE5&* diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg new file mode 100644 index 000000000..7fb7859c8 --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + +