mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-09 22:24:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Shireen Missi 2024-07-31 08:39:37 +01:00 committed by GitHub
parent 7e643589c6
commit 519fc4d753
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/nodes-base/nodes/Postgres/Postgres.node.ts
View file

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

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

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

2
packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
View file

@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
name: 'postgres', name: 'postgres',
icon: 'file:postgres.svg', icon: 'file:postgres.svg',
group: ['input'], 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"] }}', subtitle: '={{ $parameter["operation"] }}',
description: 'Get, add and update data in Postgres', description: 'Get, add and update data in Postgres',
defaults: { defaults: {