Backported CORE-6028: Trigger on system table restored in FB3 database and can't be deleted

Author: AlexPeshkoff

src/burp/backup.epp

@@ -4179,9 +4179,14 @@ void write_triggers()
 	if (tdgbl->runtimeODS >= DB_VERSION_DDL11_1)
 	{
 		FOR (REQUEST_HANDLE req_handle1)
-			X IN RDB$TRIGGERS WITH
-			X.RDB$SYSTEM_FLAG NE 1 OR
-			X.RDB$SYSTEM_FLAG MISSING
+			X IN RDB$TRIGGERS
+			CROSS Y IN RDB$RELATIONS OVER RDB$RELATION_NAME
+			WITH
+			(X.RDB$SYSTEM_FLAG NE 1 OR
+			 X.RDB$SYSTEM_FLAG MISSING)
+			AND
+			(Y.RDB$SYSTEM_FLAG NE 1 OR
+			 Y.RDB$SYSTEM_FLAG MISSING)
 
 			put(tdgbl, rec_trigger);
 			const SSHORT l = PUT_TEXT (att_trig_name, X.RDB$TRIGGER_NAME);

src/burp/burp.h

@@ -1048,6 +1048,7 @@ class BurpGlobals : public Firebird::ThreadData, public GblPool
 	isc_req_handle	handles_get_trigger_message_req_handle2;
 	isc_req_handle	handles_get_trigger_old_req_handle1;
 	isc_req_handle	handles_get_trigger_req_handle1;
+	isc_req_handle	handles_get_trigger_req_handle2;
 	isc_req_handle	handles_get_type_req_handle1;
 	isc_req_handle	handles_get_user_privilege_req_handle1;
 	isc_req_handle	handles_get_view_req_handle1;

src/burp/restore.epp

@@ -8475,9 +8475,10 @@ bool get_trigger(BurpGlobals* tdgbl)
  *	Get a trigger definition in rdb$triggers.
  *
  **************************************/
-	att_type	attribute;
+	att_type attribute;
 	BASED_ON RDB$TRIGGERS.RDB$TRIGGER_NAME name;
-	scan_attr_t		scan_next_attr;
+	scan_attr_t scan_next_attr;
+	bool skipTrig = false;
 
 	isc_tr_handle local_trans = tdgbl->global_trans ? tdgbl->global_trans : gds_trans;
 
@@ -8545,6 +8546,14 @@ bool get_trigger(BurpGlobals* tdgbl)
 				case att_trig_relation_name:
 					X.RDB$RELATION_NAME.NULL = FALSE;
 					GET_TEXT(X.RDB$RELATION_NAME);
+					// Check for trigger on system relation
+					FOR (TRANSACTION_HANDLE local_trans REQUEST_HANDLE tdgbl->handles_get_trigger_req_handle2)
+						Y IN RDB$RELATIONS
+						WITH Y.RDB$RELATION_NAME EQ X.RDB$RELATION_NAME
+						 AND Y.RDB$SYSTEM_FLAG EQ 1
+
+						skipTrig = true;
+					END_FOR;
 					break;
 
 				case att_trig_sequence:
@@ -8616,6 +8625,11 @@ bool get_trigger(BurpGlobals* tdgbl)
 					break;
 				}
 			}
+
+			// Skip trigger on system relation
+			if (skipTrig)
+				return true;
+
 		END_STORE;
 		ON_ERROR
 			general_on_error ();
@@ -8674,6 +8688,14 @@ bool get_trigger(BurpGlobals* tdgbl)
 				case att_trig_relation_name:
 					X.RDB$RELATION_NAME.NULL = FALSE;
 					GET_TEXT(X.RDB$RELATION_NAME);
+					// Check for trigger on system relation
+					FOR (TRANSACTION_HANDLE local_trans REQUEST_HANDLE tdgbl->handles_get_trigger_req_handle2)
+						Y IN RDB$RELATIONS
+						WITH Y.RDB$RELATION_NAME EQ X.RDB$RELATION_NAME
+						 AND Y.RDB$SYSTEM_FLAG EQ 1
+
+						skipTrig = true;
+					END_FOR;
 					break;
 
 				case att_trig_sequence:
@@ -8734,6 +8756,11 @@ bool get_trigger(BurpGlobals* tdgbl)
 					break;
 				}
 			}
+
+			// Skip trigger on system relation
+			if (skipTrig)
+				return true;
+
 		END_STORE;
 		ON_ERROR
 			general_on_error ();