Fix trigger CALL for row data parameters (#2377)

Copilot · mathiasrw · web-flow · commit 48169061e8aa · 2025-12-17T23:53:47.000+11:00
Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: mathiasrw &lt;1063454+mathiasrw@users.noreply.github.com&gt;
Co-authored-by: M. Wulff &lt;m@rawu.dk&gt;
diff --git a/src/60createtable.js b/src/60createtable.js
@@ -332,10 +332,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		for (var tr in table.beforeinsert) {
 			var trigger = table.beforeinsert[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					if (alasql.fn[trigger.funcid](r) === false) prevent = prevent || true;
-				} else if (trigger.statement) {
-					if (trigger.statement.execute(databaseid) === false) prevent = prevent || true;
+				if (alasql.executeTrigger(trigger, databaseid, r) === false) {
+					prevent = prevent || true;
 				}
 			}
 		}
@@ -347,11 +345,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			escape = true;
 			trigger = table.insteadofinsert[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					alasql.fn[trigger.funcid](r);
-				} else if (trigger.statement) {
-					trigger.statement.execute(databaseid);
-				}
+				alasql.executeTrigger(trigger, databaseid, r);
 			}
 		}
 		if (escape) return;
@@ -488,11 +482,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		for (var tr in table.afterinsert) {
 			var trigger = table.afterinsert[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					alasql.fn[trigger.funcid](r);
-				} else if (trigger.statement) {
-					trigger.statement.execute(databaseid);
-				}
+				alasql.executeTrigger(trigger, databaseid, r);
 			}
 		}
 		alasql.inserted = oldinserted;
@@ -507,10 +497,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		for (var tr in table.beforedelete) {
 			var trigger = table.beforedelete[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					if (alasql.fn[trigger.funcid](r) === false) prevent = prevent || true;
-				} else if (trigger.statement) {
-					if (trigger.statement.execute(databaseid) === false) prevent = prevent || true;
+				if (alasql.executeTrigger(trigger, databaseid, r) === false) {
+					prevent = prevent || true;
 				}
 			}
 		}
@@ -522,11 +510,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			escape = true;
 			var trigger = table.insteadofdelete[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					alasql.fn[trigger.funcid](r);
-				} else if (trigger.statement) {
-					trigger.statement.execute(databaseid);
-				}
+				alasql.executeTrigger(trigger, databaseid, r);
 			}
 		}
 		if (escape) return;
@@ -613,10 +597,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		for (var tr in table.beforeupdate) {
 			var trigger = table.beforeupdate[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					if (alasql.fn[trigger.funcid](this.data[i], r) === false) prevent = prevent || true;
-				} else if (trigger.statement) {
-					if (trigger.statement.execute(databaseid) === false) prevent = prevent || true;
+				if (alasql.executeTrigger(trigger, databaseid, this.data[i], r) === false) {
+					prevent = prevent || true;
 				}
 			}
 		}
@@ -628,11 +610,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			escape = true;
 			var trigger = table.insteadofupdate[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					alasql.fn[trigger.funcid](this.data[i], r);
-				} else if (trigger.statement) {
-					trigger.statement.execute(databaseid);
-				}
+				alasql.executeTrigger(trigger, databaseid, this.data[i], r);
 			}
 		}
 		if (escape) return;
@@ -685,11 +663,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 		for (var tr in table.afterupdate) {
 			var trigger = table.afterupdate[tr];
 			if (trigger) {
-				if (trigger.funcid) {
-					alasql.fn[trigger.funcid](this.data[i], r);
-				} else if (trigger.statement) {
-					trigger.statement.execute(databaseid);
-				}
+				alasql.executeTrigger(trigger, databaseid, this.data[i], r);
 			}
 		}
 	};
diff --git a/src/71trigger.js b/src/71trigger.js
@@ -108,3 +108,27 @@ yy.DropTrigger.prototype.execute = function (databaseid, params, cb) {
 	if (cb) res = cb(res);
 	return res;
 };
+
+/**
+ * Helper function to execute a trigger with proper parameter passing
+ * @param {object} trigger - The trigger object
+ * @param {string} databaseid - Database ID for statement execution
+ * @param {...any} args - Arguments to pass to the trigger function
+ * @return {*} Result from trigger execution (typically boolean or undefined)
+ */
+alasql.executeTrigger = function (trigger, databaseid, ...args) {
+	if (!trigger) return;
+
+	if (trigger.funcid) {
+		// Direct function ID (older syntax: CREATE TRIGGER ... tablename funcname)
+		return alasql.fn[trigger.funcid](...args);
+	} else if (trigger.statement) {
+		// CALL syntax: CREATE TRIGGER ... CALL funcname()
+		if (trigger.statement.expression && trigger.statement.expression.funcid) {
+			return alasql.fn[trigger.statement.expression.funcid](...args);
+		} else {
+			// Fallback: execute statement without parameters (for non-CALL statements)
+			return trigger.statement.execute(databaseid);
+		}
+	}
+};
diff --git a/src/72delete.js b/src/72delete.js
@@ -88,8 +88,8 @@ yy.Delete.prototype.compile = function (databaseid) {
 			var deletedRows = [];
 			for (var i = 0, ilen = table.data.length; i < ilen; i++) {
 				if (wherefn(table.data[i], params, alasql)) {
-					// Track deleted row for OUTPUT clause
-					if (self.output) {
+					// Track deleted row for OUTPUT clause and AFTER DELETE trigger
+					if (self.output || table.afterdelete) {
 						deletedRows.push(cloneDeep(table.data[i]));
 					}
 					// Check for transaction - if it is not possible then return all back
@@ -104,14 +104,16 @@ yy.Delete.prototype.compile = function (databaseid) {
 			}
 			table.data = newtable;
 
-			// Trigger prevent functionality
-			for (var tr in table.afterdelete) {
-				var trigger = table.afterdelete[tr];
-				if (trigger) {
-					if (trigger.funcid) {
-						alasql.fn[trigger.funcid]();
-					} else if (trigger.statement) {
-						trigger.statement.execute(databaseid);
+			// AFTER DELETE triggers - call for each deleted row
+			// Note: Triggers are called once per row per trigger (row-level triggers)
+			// For N deleted rows and M triggers, this results in N×M trigger calls
+			if (table.afterdelete) {
+				for (var i = 0; i < deletedRows.length; i++) {
+					for (var tr in table.afterdelete) {
+						var trigger = table.afterdelete[tr];
+						if (trigger) {
+							alasql.executeTrigger(trigger, databaseid, deletedRows[i]);
+						}
 					}
 				}
 			}
diff --git a/test/test1119.js b/test/test1119.js
@@ -3,7 +3,7 @@ if (typeof exports === 'object') {
 	var alasql = require('..'); // You might need to adjust the path depending on where you save the test file
 }
 
-describe.skip('Test 1119 - Trigger callback parameter', function () {
+describe('Test 1119 - Trigger callback parameter', function () {
 	const test = '1119'; // Test file number
 
 	before(function () {

Original file line number	Diff line number	Diff line change
`@@ -332,10 +332,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`332`	`332`	`for (var tr in table.beforeinsert) {`
`333`	`333`	`var trigger = table.beforeinsert[tr];`
`334`	`334`	`if (trigger) {`
`335`		`- if (trigger.funcid) {`
`336`		`- if (alasql.fn[trigger.funcid](r) === false) prevent = prevent \|\| true;`
`337`		`- } else if (trigger.statement) {`
`338`		`- if (trigger.statement.execute(databaseid) === false) prevent = prevent \|\| true;`
	`335`	`+ if (alasql.executeTrigger(trigger, databaseid, r) === false) {`
	`336`	`+ prevent = prevent \|\| true;`
`339`	`337`	`}`
`340`	`338`	`}`
`341`	`339`	`}`
`@@ -347,11 +345,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`347`	`345`	`escape = true;`
`348`	`346`	`trigger = table.insteadofinsert[tr];`
`349`	`347`	`if (trigger) {`
`350`		`- if (trigger.funcid) {`
`351`		`- alasql.fn[trigger.funcid](r);`
`352`		`- } else if (trigger.statement) {`
`353`		`- trigger.statement.execute(databaseid);`
`354`		`- }`
	`348`	`+ alasql.executeTrigger(trigger, databaseid, r);`
`355`	`349`	`}`
`356`	`350`	`}`
`357`	`351`	`if (escape) return;`
`@@ -488,11 +482,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`488`	`482`	`for (var tr in table.afterinsert) {`
`489`	`483`	`var trigger = table.afterinsert[tr];`
`490`	`484`	`if (trigger) {`
`491`		`- if (trigger.funcid) {`
`492`		`- alasql.fn[trigger.funcid](r);`
`493`		`- } else if (trigger.statement) {`
`494`		`- trigger.statement.execute(databaseid);`
`495`		`- }`
	`485`	`+ alasql.executeTrigger(trigger, databaseid, r);`
`496`	`486`	`}`
`497`	`487`	`}`
`498`	`488`	`alasql.inserted = oldinserted;`
`@@ -507,10 +497,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`507`	`497`	`for (var tr in table.beforedelete) {`
`508`	`498`	`var trigger = table.beforedelete[tr];`
`509`	`499`	`if (trigger) {`
`510`		`- if (trigger.funcid) {`
`511`		`- if (alasql.fn[trigger.funcid](r) === false) prevent = prevent \|\| true;`
`512`		`- } else if (trigger.statement) {`
`513`		`- if (trigger.statement.execute(databaseid) === false) prevent = prevent \|\| true;`
	`500`	`+ if (alasql.executeTrigger(trigger, databaseid, r) === false) {`
	`501`	`+ prevent = prevent \|\| true;`
`514`	`502`	`}`
`515`	`503`	`}`
`516`	`504`	`}`
`@@ -522,11 +510,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`522`	`510`	`escape = true;`
`523`	`511`	`var trigger = table.insteadofdelete[tr];`
`524`	`512`	`if (trigger) {`
`525`		`- if (trigger.funcid) {`
`526`		`- alasql.fn[trigger.funcid](r);`
`527`		`- } else if (trigger.statement) {`
`528`		`- trigger.statement.execute(databaseid);`
`529`		`- }`
	`513`	`+ alasql.executeTrigger(trigger, databaseid, r);`
`530`	`514`	`}`
`531`	`515`	`}`
`532`	`516`	`if (escape) return;`
`@@ -613,10 +597,8 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`613`	`597`	`for (var tr in table.beforeupdate) {`
`614`	`598`	`var trigger = table.beforeupdate[tr];`
`615`	`599`	`if (trigger) {`
`616`		`- if (trigger.funcid) {`
`617`		`- if (alasql.fn[trigger.funcid](this.data[i], r) === false) prevent = prevent \|\| true;`
`618`		`- } else if (trigger.statement) {`
`619`		`- if (trigger.statement.execute(databaseid) === false) prevent = prevent \|\| true;`
	`600`	`+ if (alasql.executeTrigger(trigger, databaseid, this.data[i], r) === false) {`
	`601`	`+ prevent = prevent \|\| true;`
`620`	`602`	`}`
`621`	`603`	`}`
`622`	`604`	`}`
`@@ -628,11 +610,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`628`	`610`	`escape = true;`
`629`	`611`	`var trigger = table.insteadofupdate[tr];`
`630`	`612`	`if (trigger) {`
`631`		`- if (trigger.funcid) {`
`632`		`- alasql.fn[trigger.funcid](this.data[i], r);`
`633`		`- } else if (trigger.statement) {`
`634`		`- trigger.statement.execute(databaseid);`
`635`		`- }`
	`613`	`+ alasql.executeTrigger(trigger, databaseid, this.data[i], r);`
`636`	`614`	`}`
`637`	`615`	`}`
`638`	`616`	`if (escape) return;`
`@@ -685,11 +663,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {`
`685`	`663`	`for (var tr in table.afterupdate) {`
`686`	`664`	`var trigger = table.afterupdate[tr];`
`687`	`665`	`if (trigger) {`
`688`		`- if (trigger.funcid) {`
`689`		`- alasql.fn[trigger.funcid](this.data[i], r);`
`690`		`- } else if (trigger.statement) {`
`691`		`- trigger.statement.execute(databaseid);`
`692`		`- }`
	`666`	`+ alasql.executeTrigger(trigger, databaseid, this.data[i], r);`
`693`	`667`	`}`
`694`	`668`	`}`
`695`	`669`	`};`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ if (typeof exports === 'object') {`
`3`	`3`	`var alasql = require('..'); // You might need to adjust the path depending on where you save the test file`
`4`	`4`	`}`
`5`	`5`
`6`		`-describe.skip('Test 1119 - Trigger callback parameter', function () {`
	`6`	`+describe('Test 1119 - Trigger callback parameter', function () {`
`7`	`7`	`const test = '1119'; // Test file number`
`8`	`8`
`9`	`9`	`before(function () {`