Fix expressions in query parameters for Postgres executeQuery operation

n8n-io · Jul 26, 2024 · f67b645 · f67b645
1 parent cd74f43
commit f67b645
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
@@ -79,22 +79,26 @@ export async function execute(
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
 			if (rawReplacements) {
-				const rawValues = rawReplacements
-					.replace(/^=+/, '')
-					.split(',')
-					.filter((entry) => entry)
-					.map((entry) => entry.trim());
-
-				for (const rawValue of rawValues) {
-					const resolvables = getResolvables(rawValue);
-
-					if (resolvables.length) {
-						for (const resolvable of resolvables) {
-							values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+				const rawValues = rawReplacements.replace(/^=+/, '');
+				const resolvables = getResolvables(rawValues);
+				if (resolvables.length) {
+					for (const resolvable of resolvables) {
+						const evaluatedValues = this.evaluateExpression(`${resolvable}`, i)
+							?.toString()
+							?.split(',')
+							.filter((entry) => entry)
+							.map((entry) => entry.trim());
+						if (evaluatedValues) {
+							values.push(...evaluatedValues);
 						}
-					} else {
-						values.push(rawValue);
 					}
+				} else {
+					values.push(
+						...rawValues
+							.split(',')
+							.filter((entry) => entry)
+							.map((entry) => entry.trim()),
+					);
 				}
 			}
 		} else {