Save value of RDB$TRIGGERS.RDB$SYSTEM_FLAG into Trigger::sysTrigger

Author: hvlad

src/jrd/jrd.h

@@ -137,19 +137,19 @@ class Trigger
 public:
 	Firebird::HalfStaticArray<UCHAR, 128> blr;			// BLR code
 	Firebird::HalfStaticArray<UCHAR, 128> debugInfo;	// Debug info
-	Statement* statement;							// Compiled statement
+	Statement* statement;								// Compiled statement
 	bool		releaseInProgress;
-	bool		sysTrigger;
+	SSHORT		sysTrigger;					// See fb_sysflag in constants.h
 	FB_UINT64	type;						// Trigger type
 	USHORT		flags;						// Flags as they are in RDB$TRIGGERS table
 	jrd_rel*	relation;					// Trigger parent relation
-	MetaName	name;				// Trigger name
-	MetaName	engine;				// External engine name
+	MetaName	name;						// Trigger name
+	MetaName	engine;						// External engine name
 	Firebird::string	entryPoint;			// External trigger entrypoint
 	Firebird::string	extBody;			// External trigger body
 	ExtEngineManager::Trigger* extTrigger;	// External trigger
 	Nullable<bool> ssDefiner;
-	MetaName	owner;				// Owner for SQL SECURITY
+	MetaName	owner;						// Owner for SQL SECURITY
 
 	bool isActive() const;
 

src/jrd/met.epp

@@ -115,7 +115,7 @@ static int blocking_ast_relation(void*);
 static int partners_ast_relation(void*);
 static int rescan_ast_relation(void*);
 static ULONG get_rel_flags_from_FLAGS(USHORT);
-static void get_trigger(thread_db*, jrd_rel*, bid*, bid*, TrigVector**, const TEXT*, FB_UINT64, bool,
+static void get_trigger(thread_db*, jrd_rel*, bid*, bid*, TrigVector**, const TEXT*, FB_UINT64, SSHORT,
 	USHORT, const MetaName&, const string&, const bid*, Nullable<bool> ssDefiner);
 static bool get_type(thread_db*, USHORT*, const UCHAR*, const TEXT*);
 static void lookup_view_contexts(thread_db*, jrd_rel*);
@@ -124,7 +124,7 @@ static ValueExprNode* parse_field_default_blr(thread_db* tdbb, bid* blob_id);
 static BoolExprNode* parse_field_validation_blr(thread_db* tdbb, bid* blob_id, const MetaName name);
 static bool resolve_charset_and_collation(thread_db*, USHORT*, const UCHAR*, const UCHAR*);
 static void save_trigger_data(thread_db*, TrigVector**, jrd_rel*, Statement*, blb*, blb*,
-	const TEXT*, FB_UINT64, bool, USHORT, const MetaName&, const string&,
+	const TEXT*, FB_UINT64, SSHORT, USHORT, const MetaName&, const string&,
 	const bid*, Nullable<bool> ssDefiner);
 static void scan_partners(thread_db*, jrd_rel*);
 static bool verify_TRG_ignore_perm(thread_db*, const MetaName&);
@@ -2049,7 +2049,7 @@ void MET_load_trigger(thread_db* tdbb,
 							triggers,
 							TRG.RDB$TRIGGER_NAME,
 							TRG.RDB$TRIGGER_TYPE,
-							(bool) TRG.RDB$SYSTEM_FLAG,
+							TRG.RDB$SYSTEM_FLAG,
 							trig_flags,
 							engine,
 							entryPoint,
@@ -2070,7 +2070,7 @@ void MET_load_trigger(thread_db* tdbb,
 							triggers + trigger_action,
 							TRG.RDB$TRIGGER_NAME,
 							(UCHAR) trigger_action,
-							(bool) TRG.RDB$SYSTEM_FLAG,
+							TRG.RDB$SYSTEM_FLAG,
 							trig_flags,
 							engine,
 							entryPoint,
@@ -3382,7 +3382,7 @@ void MET_parse_sys_trigger(thread_db* tdbb, jrd_rel* relation)
 			if (trig_flags & TRG_ignore_perm)
 				statement->flags |= Statement::FLAG_IGNORE_PERM;
 
-			save_trigger_data(tdbb, ptr, relation, statement, NULL, NULL, NULL, type, true, 0, "",
+			save_trigger_data(tdbb, ptr, relation, statement, NULL, NULL, NULL, type, TRG.RDB$SYSTEM_FLAG, 0, "",
 				"", NULL, Nullable<bool>());
 		}
 	}
@@ -4744,7 +4744,7 @@ ULONG MET_get_rel_flags_from_TYPE(USHORT type)
 static void get_trigger(thread_db* tdbb, jrd_rel* relation,
 						bid* blob_id, bid* debug_blob_id, TrigVector** ptr,
 						const TEXT* name, FB_UINT64 type,
-						bool sys_trigger, USHORT flags,
+						SSHORT sys_trigger, USHORT flags,
 						const MetaName& engine, const string& entryPoint,
 						const bid* body, Nullable<bool> ssDefiner)
 {
@@ -5126,7 +5126,7 @@ static bool resolve_charset_and_collation(thread_db* tdbb,
 static void save_trigger_data(thread_db* tdbb, TrigVector** ptr, jrd_rel* relation,
 							  Statement* statement, blb* blrBlob, blb* debugInfoBlob,
 							  const TEXT* name, FB_UINT64 type,
-							  bool sys_trigger, USHORT flags,
+							  SSHORT sys_trigger, USHORT flags,
 							  const MetaName& engine, const string& entryPoint,
 							  const bid* body, Nullable<bool> ssDefiner)
 {