Revert "Added function to fix crash with indirect recursion happening…

… previously" This reverts commit ce1eff3.
babelfish-for-postgresql · Nov 22, 2023 · f847083 · f847083
1 parent 1645ee5
commit f847083
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/contrib/babelfishpg_tsql/src/hooks.c b/contrib/babelfishpg_tsql/src/hooks.c
@@ -736,16 +736,26 @@ static bool
 pltsql_bbfViewHasInsteadofTrigger(Relation view, CmdType event)
 {
 	TriggerDesc *trigDesc = view->trigdesc;
-	if (triggerOids && trigDesc)
+	if (triggerOids)
 	{
 		int i;
 		for (i = 0; i < trigDesc->numtriggers; i++)
 		{
 			Trigger *trigger = &trigDesc->triggers[i];
 			Oid current_tgoid = trigger->tgoid;
-			Oid prev_tgoid = lfirst_oid(list_tail(triggerOids));
-			if(prev_tgoid == current_tgoid)
-				return false; // Trigger calls itself
+			Oid prev_tgoid = InvalidOid;
+			prev_tgoid = lfirst_oid(list_tail(triggerOids));
+			if (prev_tgoid == current_tgoid)
+			{
+				return false; /** Direct recursive trigger case*/
+			}
+			else if (list_member_oid(triggerOids, current_tgoid))
+            {
+                /** Indirect recursive trigger case*/
+                ereport(ERROR,
+                        (errcode(ERRCODE_SYNTAX_ERROR),
+                         errmsg("Maximum stored procedure, function, trigger, or view nesting level exceeded (limit 32)")));
+            }
 		}
 	}
 

diff --git a/test/JDBC/expected/BABEL-2170-vu-verify.out b/test/JDBC/expected/BABEL-2170-vu-verify.out
@@ -593,13 +593,9 @@ GO
 ~~ERROR (Message: Maximum stored procedure, function, trigger, or view nesting level exceeded (limit 32))~~
 
 
-UPDATE babel_2170_vu_employees_view_rec SET MonthSalary = MonthSalary +100 WHERE EmployeeID = 2;
-GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: Maximum stored procedure, function, trigger, or view nesting level exceeded (limit 32))~~
-
 
+-- UPDATE babel_2170_vu_employees_view_rec SET MonthSalary = MonthSalary +100 WHERE EmployeeID = 2;
+-- GO
 DROP TRIGGER IF EXISTS babel_2170_vu_employees_view_iot_rec;
 GO
 

diff --git a/test/JDBC/input/triggers/BABEL-2170-vu-verify.sql b/test/JDBC/input/triggers/BABEL-2170-vu-verify.sql
@@ -337,8 +337,8 @@ GO
 UPDATE babel_2170_vu_employees_view SET MonthSalary = MonthSalary +100 WHERE EmployeeID = 2;
 GO
 
-UPDATE babel_2170_vu_employees_view_rec SET MonthSalary = MonthSalary +100 WHERE EmployeeID = 2;
-GO
+-- UPDATE babel_2170_vu_employees_view_rec SET MonthSalary = MonthSalary +100 WHERE EmployeeID = 2;
+-- GO
 
 DROP TRIGGER IF EXISTS babel_2170_vu_employees_view_iot_rec;
 GO