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

feat: Do not show errors not processed by n8n (no-changelog) (#9598)

Browse Source 
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
Michael Kret
2024-06-20 08:45:00 +03:00
committed by GitHub
parent 4740162232
commit b7aea957b8
317 changed files with 471 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
View File

@@ -335,7 +335,7 @@ export class MySqlV1 implements INodeType {
[] as INodeExecutionData[],
);
} catch (error) {
if (this.continueOnFail()) {
if (this.continueOnFail(error)) {
returnItems = this.helpers.returnJsonArray({ error: error.message });
} else {
await connection.end();
@@ -372,7 +372,7 @@ export class MySqlV1 implements INodeType {
returnItems = this.helpers.returnJsonArray(queryResult[0] as unknown as IDataObject);
} catch (error) {
if (this.continueOnFail()) {
if (this.continueOnFail(error)) {
returnItems = this.helpers.returnJsonArray({ error: error.message });
} else {
await connection.end();
@@ -407,7 +407,7 @@ export class MySqlV1 implements INodeType {
queryResult.map((result) => result[0]) as unknown as IDataObject[],
);
} catch (error) {
if (this.continueOnFail()) {
if (this.continueOnFail(error)) {
returnItems = this.helpers.returnJsonArray({ error: error.message });
} else {
await connection.end();

6
packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
View File

@@ -264,7 +264,7 @@ export function configureQueryRunner(
} catch (err) {
const error = parseMySqlError.call(this, err, 0, formatedQueries);
if (!this.continueOnFail()) throw error;
if (!this.continueOnFail(err)) throw error;
returnData.push({ json: { message: error.message, error: { ...error } } });
}
} else {
@@ -302,7 +302,7 @@ export function configureQueryRunner(
} catch (err) {
const error = parseMySqlError.call(this, err, index, [formatedQuery]);
if (!this.continueOnFail()) {
if (!this.continueOnFail(err)) {
connection.release();
throw error;
}
@@ -352,7 +352,7 @@ export function configureQueryRunner(
connection.release();
}
if (!this.continueOnFail()) throw error;
if (!this.continueOnFail(err)) throw error;
returnData.push(prepareErrorItem(queries[index], error as Error, index));
// Return here because we already rolled back the transaction