fix(Postgres Node): Expressions in query parameters for Postgres executeQuery operation (#10217)

packages/nodes-base/nodes/Postgres/Postgres.node.ts

@@ -11,7 +11,7 @@ export class Postgres extends VersionedNodeType {
 			name: 'postgres',
 			icon: 'file:postgres.svg',
 			group: ['input'],
-			defaultVersion: 2.4,
+			defaultVersion: 2.5,
 			description: 'Get, add and update data in Postgres',
 			parameterPane: 'wide',
 		};
@@ -23,6 +23,7 @@ export class Postgres extends VersionedNodeType {
 			2.2: new PostgresV2(baseDescription),
 			2.3: new PostgresV2(baseDescription),
 			2.4: new PostgresV2(baseDescription),
+			2.5: new PostgresV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);

packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts

@@ -3,6 +3,7 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
+	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -78,7 +79,29 @@ export async function execute(
 
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
+			const stringToArray = (str: NodeParameterValueType | undefined) => {
+				if (!str) return [];
+				return String(str)
+					.split(',')
+					.filter((entry) => entry)
+					.map((entry) => entry.trim());
+			};
+
 			if (rawReplacements) {
+				const nodeVersion = nodeOptions.nodeVersion as number;
+
+				if (nodeVersion >= 2.5) {
+					const rawValues = rawReplacements.replace(/^=+/, '');
+					const resolvables = getResolvables(rawValues);
+					if (resolvables.length) {
+						for (const resolvable of resolvables) {
+							const evaluatedValues = stringToArray(this.evaluateExpression(`${resolvable}`, i));
+							if (evaluatedValues.length) values.push(...evaluatedValues);
+						}
+					} else {
+						values.push(...stringToArray(rawValues));
+					}
+				} else {
 					const rawValues = rawReplacements
 						.replace(/^=+/, '')
 						.split(',')
@@ -97,6 +120,7 @@ export async function execute(
 						}
 					}
 				}
+			}
 		} else {
 			if (Array.isArray(queryReplacement)) {
 				values = queryReplacement as IDataObject[];

packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts

@@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'postgres',
 	icon: 'file:postgres.svg',
 	group: ['input'],
-	version: [2, 2.1, 2.2, 2.3, 2.4],
+	version: [2, 2.1, 2.2, 2.3, 2.4, 2.5],
 	subtitle: '={{ $parameter["operation"] }}',
 	description: 'Get, add and update data in Postgres',
 	defaults: {