admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Postgres Node): Empty return data fix for Postgres and MySQL (#7016)

Browse Source
This commit is contained in:
Michael Kret
2023-08-25 18:38:09 +03:00
committed by GitHub
parent f02f6b659a
commit 176ccd62bc
9 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
View File

@@ -199,6 +199,15 @@ export function addReturning(
return [`${query} RETURNING $${replacementIndex}:name`, [...replacements, outputColumns]];
}
const isSelectQuery = (query: string) => {
return query
.replace(/\/\*.*?\*\//g, '') // remove multiline comments
.replace(/\n/g, '')
.split(';')
.filter((statement) => statement && !statement.startsWith('--')) // remove comments and empty statements
.every((statement) => statement.trim().toLowerCase().startsWith('select'));
};
export function configureQueryRunner(
this: IExecuteFunctions,
node: INode,
@@ -221,7 +230,16 @@ export function configureQueryRunner(
});
})
.flat();
returnData = returnData.length ? returnData : emptyReturnData;
if (!returnData.length) {
if ((options?.nodeVersion as number) < 2.3) {
returnData = emptyReturnData;
} else {
returnData = queries.every((query) => isSelectQuery(query.query))
? []
: [{ json: { success: true } }];
}
}
} catch (err) {
const error = parsePostgresError(node, err, queries);
if (!continueOnFail) throw error;
@@ -242,13 +260,26 @@ export function configureQueryRunner(
const result: INodeExecutionData[] = [];
for (let i = 0; i < queries.length; i++) {
try {
const transactionResult: IDataObject[] = await transaction.any(
queries[i].query,
queries[i].values,
);
const query = queries[i].query;
const values = queries[i].values;
let transactionResults;
if ((options?.nodeVersion as number) < 2.3) {
transactionResults = await transaction.any(query, values);
} else {
transactionResults = (await transaction.multi(query, values)).flat();
}
if (!transactionResults.length) {
if ((options?.nodeVersion as number) < 2.3) {
transactionResults = emptyReturnData;
} else {
transactionResults = isSelectQuery(query) ? [] : [{ success: true }];
}
}
const executionData = this.helpers.constructExecutionMetaData(
wrapData(transactionResult.length ? transactionResult : emptyReturnData),
wrapData(transactionResults),
{ itemData: { item: i } },
);
@@ -265,17 +296,30 @@ export function configureQueryRunner(
}
if (queryBatching === 'independently') {
returnData = await db.task(async (t) => {
returnData = await db.task(async (task) => {
const result: INodeExecutionData[] = [];
for (let i = 0; i < queries.length; i++) {
try {
const transactionResult: IDataObject[] = await t.any(
queries[i].query,
queries[i].values,
);
const query = queries[i].query;
const values = queries[i].values;
let transactionResults;
if ((options?.nodeVersion as number) < 2.3) {
transactionResults = await task.any(query, values);
} else {
transactionResults = (await task.multi(query, values)).flat();
}
if (!transactionResults.length) {
if ((options?.nodeVersion as number) < 2.3) {
transactionResults = emptyReturnData;
} else {
transactionResults = isSelectQuery(query) ? [] : [{ success: true }];
}
}
const executionData = this.helpers.constructExecutionMetaData(
wrapData(transactionResult.length ? transactionResult : emptyReturnData),
wrapData(transactionResults),
{ itemData: { item: i } },
);