fix(Postgres Trigger Node): Imposible to cancell execution manually (#6709)

This commit is contained in:
Michael Kret
2023-08-01 12:56:54 +03:00
committed by GitHub
parent fce8cc4275
commit 491378de77
2 changed files with 146 additions and 72 deletions

View File

@@ -8,50 +8,79 @@ import type {
import pgPromise from 'pg-promise';
import type pg from 'pg-promise/typescript/pg-subset';
export function prepareNames(id: string, mode: string, additionalFields: IDataObject) {
let suffix = id.replace(/-/g, '_');
if (mode === 'manual') {
suffix = `${suffix}_manual`;
}
let functionName =
(additionalFields.functionName as string) || `n8n_trigger_function_${suffix}()`;
if (!(functionName.includes('(') && functionName.includes(')'))) {
functionName = `${functionName}()`;
}
const triggerName = (additionalFields.triggerName as string) || `n8n_trigger_${suffix}`;
const channelName = (additionalFields.channelName as string) || `n8n_channel_${suffix}`;
if (channelName.includes('-')) {
throw new Error('Channel name cannot contain hyphens (-)');
}
return { functionName, triggerName, channelName };
}
export async function pgTriggerFunction(
this: ITriggerFunctions,
db: pgPromise.IDatabase<{}, pg.IClient>,
additionalFields: IDataObject,
functionName: string,
triggerName: string,
channelName: string,
): Promise<void> {
const schema = this.getNodeParameter('schema', 'public', { extractValue: true }) as string;
const tableName = this.getNodeParameter('tableName', undefined, {
extractValue: true,
}) as string;
const target = `${schema}."${tableName}"`;
const firesOn = this.getNodeParameter('firesOn', 0) as string;
const functionReplace =
"CREATE OR REPLACE FUNCTION $1:raw RETURNS trigger LANGUAGE 'plpgsql' COST 100 VOLATILE NOT LEAKPROOF AS $BODY$ begin perform pg_notify('$2:raw', row_to_json($3:raw)::text); return null; end; $BODY$;";
const dropIfExist = 'DROP TRIGGER IF EXISTS $1:raw ON $2:raw';
const functionExists =
"CREATE FUNCTION $1:raw RETURNS trigger LANGUAGE 'plpgsql' COST 100 VOLATILE NOT LEAKPROOF AS $BODY$ begin perform pg_notify('$2:raw', row_to_json($3:raw)::text); return null; end; $BODY$";
const trigger =
'CREATE TRIGGER $4:raw AFTER $3:raw ON $1:raw FOR EACH ROW EXECUTE FUNCTION $2:raw';
const whichData = firesOn === 'DELETE' ? 'old' : 'new';
const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject;
const nodeId = this.getNode().id.replace(/-/g, '_');
let functionName =
(additionalFields.functionName as string) || `n8n_trigger_function_${nodeId}()`;
if (!functionName.includes('()')) {
functionName = functionName.concat('()');
}
const triggerName = (additionalFields.triggerName as string) || `n8n_trigger_${nodeId}`;
const channelName = (additionalFields.channelName as string) || `n8n_channel_${nodeId}`;
if (channelName.includes('-')) {
throw new Error('Channel name cannot contain hyphens (-)');
}
const replaceIfExists = additionalFields.replaceIfExists || false;
const replaceIfExists = additionalFields.replaceIfExists ?? false;
try {
if (replaceIfExists || !(additionalFields.triggerName || additionalFields.functionName)) {
if (replaceIfExists || !(additionalFields.triggerName ?? additionalFields.functionName)) {
await db.any(functionReplace, [functionName, channelName, whichData]);
await db.any(dropIfExist, [triggerName, target, whichData]);
} else {
await db.any(functionExists, [functionName, channelName, whichData]);
}
await db.any(trigger, [target, functionName, firesOn, triggerName]);
} catch (err) {
if (err.message.includes('near "-"')) {
} catch (error) {
if ((error as Error).message.includes('near "-"')) {
throw new Error('Names cannot contain hyphens (-)');
}
throw new Error(err as string);
throw error;
}
}
@@ -77,23 +106,25 @@ export async function initDB(this: ITriggerFunctions | ILoadOptionsFunctions) {
config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
config.sslmode = (credentials.ssl as string) || 'disable';
}
return pgp(config);
const db = pgp(config);
return { db, pgp };
}
export async function searchSchema(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
const db = await initDB.call(this);
const { db, pgp } = await initDB.call(this);
const schemaList = await db.any('SELECT schema_name FROM information_schema.schemata');
const results: INodeListSearchItems[] = schemaList.map((s) => ({
const results: INodeListSearchItems[] = (schemaList as IDataObject[]).map((s) => ({
name: s.schema_name as string,
value: s.schema_name as string,
}));
await db.$pool.end();
pgp.end();
return { results };
}
export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
const schema = this.getNodeParameter('schema', 0) as IDataObject;
const db = await initDB.call(this);
const { db, pgp } = await initDB.call(this);
let tableList = [];
try {
tableList = await db.any(
@@ -103,35 +134,10 @@ export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeLi
} catch (error) {
throw new Error(error as string);
}
const results: INodeListSearchItems[] = tableList.map((s) => ({
const results: INodeListSearchItems[] = (tableList as IDataObject[]).map((s) => ({
name: s.table_name as string,
value: s.table_name as string,
}));
await db.$pool.end();
pgp.end();
return { results };
}
export async function dropTriggerFunction(
this: ITriggerFunctions,
db: pgPromise.IDatabase<{}, pg.IClient>,
): Promise<void> {
const schema = this.getNodeParameter('schema', undefined, { extractValue: true }) as string;
const tableName = this.getNodeParameter('tableName', undefined, {
extractValue: true,
}) as string;
const target = `${schema}."${tableName}"`;
const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject;
const nodeId = this.getNode().id.replace(/-/g, '_');
let functionName =
(additionalFields.functionName as string) || `n8n_trigger_function_${nodeId}()`;
if (!functionName.includes('()')) {
functionName = functionName.concat('()');
}
const triggerName = (additionalFields.triggerName as string) || `n8n_trigger_${nodeId}`;
try {
await db.any('DROP FUNCTION IF EXISTS $1:raw CASCADE', [functionName]);
await db.any('DROP TRIGGER IF EXISTS $1:raw ON $2:raw CASCADE', [triggerName, target]);
} catch (error) {
throw new Error(error as string);
}
}