admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Postgres Node): Remove reusable connections (no-changelog) (#6259)

Browse Source
This commit is contained in:
Michael Kret
2023-05-19 16:42:24 +03:00
committed by GitHub
parent 4b5cbe7750
commit be5d3264ad
7 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
View File

@@ -5,10 +5,10 @@ import type {
INodeCredentialTestResult,
} from 'n8n-workflow';
import { Connections } from '../transport';
import { configurePostgres } from '../transport';
import { Client } from 'ssh2';
import type { ConnectionsData, PgpClient } from '../helpers/interfaces';
import type { PgpClient } from '../helpers/interfaces';
export async function postgresConnectionTest(
this: ICredentialTestFunctions,
@@ -20,12 +20,7 @@ export async function postgresConnectionTest(
let pgpClientCreated: PgpClient | undefined;
try {
const { db, pgp, sshClient } = (await Connections.getInstance(
credentials,
{},
true,
sshClientCreated,
)) as ConnectionsData;
const { db, pgp, sshClient } = await configurePostgres(credentials, {}, sshClientCreated);
sshClientCreated = sshClient;
pgpClientCreated = pgp;
@@ -57,9 +52,6 @@ export async function postgresConnectionTest(
if (pgpClientCreated) {
pgpClientCreated.end();
}
//set the connection instance to null so that it can be recreated
await Connections.getInstance({}, {}, false, undefined, true);
}
return {
status: 'OK',

18
packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
View File

@@ -1,12 +1,12 @@
import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
import type { ConnectionsData } from '../helpers/interfaces';
import { Connections } from '../transport';
import { configurePostgres } from '../transport';
export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
const credentials = await this.getCredentials('postgres');
const options = { nodeVersion: this.getNode().typeVersion };
const { db } = (await Connections.getInstance(credentials, options)) as ConnectionsData;
const { db, pgp, sshClient } = await configurePostgres(credentials, options);
try {
const response = await db.any('SELECT schema_name FROM information_schema.schemata');
@@ -19,13 +19,18 @@ export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeLi
};
} catch (error) {
throw error;
} finally {
if (sshClient) {
sshClient.end();
}
pgp.end();
}
}
export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
const credentials = await this.getCredentials('postgres');
const options = { nodeVersion: this.getNode().typeVersion };
const { db } = (await Connections.getInstance(credentials, options)) as ConnectionsData;
const { db, pgp, sshClient } = await configurePostgres(credentials, options);
const schema = this.getNodeParameter('schema', 0, {
extractValue: true,
@@ -45,5 +50,10 @@ export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeLis
};
} catch (error) {
throw error;
} finally {
if (sshClient) {
sshClient.end();
}
pgp.end();
}
}

11
packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
View File

@@ -1,13 +1,13 @@
import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
import type { ConnectionsData } from '../helpers/interfaces';
import { getTableSchema } from '../helpers/utils';
import { Connections } from '../transport';
import { configurePostgres } from '../transport';
export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const credentials = await this.getCredentials('postgres');
const options = { nodeVersion: this.getNode().typeVersion };
const { db } = (await Connections.getInstance(credentials, options)) as ConnectionsData;
const { db, pgp, sshClient } = await configurePostgres(credentials, options);
const schema = this.getNodeParameter('schema', 0, {
extractValue: true,
@@ -27,6 +27,11 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
}));
} catch (error) {
throw error;
} finally {
if (sshClient) {
sshClient.end();
}
pgp.end();
}
}