From 457cac4cf9f7093d48e9f4ccb0021423c18f0b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 21 Feb 2024 11:27:21 +0100
Subject: [PATCH] fix(Postgres Node): Close connection pool only if it's not
 already closed or closing (#8690)

---
 packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts    | 4 ++--
 packages/nodes-base/nodes/Postgres/v2/actions/router.ts       | 2 +-
 packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts   | 4 ++--
 packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts  | 2 +-
 .../nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
index e5a2891cb4..46d3c787a5 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -237,7 +237,7 @@ export class PostgresTrigger implements INodeType {
 			this.emit([this.helpers.returnJsonArray([data])]);
 		};
 
-		// create trigger, funstion and channel or use existing channel
+		// create trigger, function and channel or use existing channel
 		const pgNames = prepareNames(this.getNode().id, this.getMode(), additionalFields);
 		if (triggerMode === 'createTrigger') {
 			await pgTriggerFunction.call(
@@ -284,7 +284,7 @@ export class PostgresTrigger implements INodeType {
 					`Postgres Trigger Error: ${(error as Error).message}`,
 				);
 			} finally {
-				await db.$pool.end();
+				if (!db.$pool.ending) await db.$pool.end();
 			}
 		};
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index 38a03edf7e..60d780ce0e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -58,7 +58,7 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 			sshClient.end();
 		}
 
-		await db.$pool.end();
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 
 	return [returnData];
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
index 1e1f4f2c74..7bb01aaa94 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
@@ -23,7 +23,7 @@ export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeLi
 		if (sshClient) {
 			sshClient.end();
 		}
-		await db.$pool.end();
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
 export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
@@ -54,6 +54,6 @@ export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeLis
 		if (sshClient) {
 			sshClient.end();
 		}
-		await db.$pool.end();
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
index f11754b1c7..64e4ba8d4e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
@@ -31,7 +31,7 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
 		if (sshClient) {
 			sshClient.end();
 		}
-		await db.$pool.end();
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
index cad0923b05..5f3428af3a 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -94,6 +94,6 @@ export async function getMappingColumns(
 		if (sshClient) {
 			sshClient.end();
 		}
-		await db.$pool.end();
+		if (!db.$pool.ending) await db.$pool.end();
 	}
 }