Add field to RDB$VIEW_RELATIONS index

Author: asfernandes

src/jrd/SystemTriggers.epp

@@ -1298,21 +1298,21 @@ void beforeInsertUserPrivilege(thread_db* tdbb, Record* record)
 							AutoCacheRequest request2(tdbb, request2CacheId);
 
 							FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
-								RFL2 IN RDB$RELATION_FIELDS
-								CROSS VRL2 IN RDB$VIEW_RELATIONS
-								CROSS REL2 IN RDB$RELATIONS
-								WITH RFL2.RDB$SCHEMA_NAME = schemaName.c_str() AND
-									 RFL2.RDB$PACKAGE_NAME MISSING AND
-									 RFL2.RDB$RELATION_NAME = relationName.c_str() AND
-									 RFL2.RDB$FIELD_NAME = fieldName.c_str() AND
-									 RFL2.RDB$BASE_FIELD NOT MISSING AND
-									 VRL2.RDB$SCHEMA_NAME = RFL2.RDB$SCHEMA_NAME AND
-									 VRL2.RDB$PACKAGE_NAME MISSING AND
-									 VRL2.RDB$VIEW_NAME = RFL2.RDB$RELATION_NAME AND
-									 VRL2.RDB$VIEW_CONTEXT = RFL2.RDB$VIEW_CONTEXT AND
-									 REL2.RDB$SCHEMA_NAME = VRL2.RDB$RELATION_SCHEMA_NAME AND
-									 REL2.RDB$PACKAGE_NAME MISSING AND
-									 REL2.RDB$RELATION_NAME = VRL2.RDB$RELATION_NAME
+							RFL2 IN RDB$RELATION_FIELDS
+							CROSS VRL2 IN RDB$VIEW_RELATIONS
+							CROSS REL2 IN RDB$RELATIONS
+							WITH RFL2.RDB$SCHEMA_NAME = schemaName.c_str() AND
+								 RFL2.RDB$PACKAGE_NAME MISSING AND
+								 RFL2.RDB$RELATION_NAME = relationName.c_str() AND
+								 RFL2.RDB$FIELD_NAME = fieldName.c_str() AND
+								 RFL2.RDB$BASE_FIELD NOT MISSING AND
+								 VRL2.RDB$SCHEMA_NAME = RFL2.RDB$SCHEMA_NAME AND
+								 VRL2.RDB$PACKAGE_NAME MISSING AND
+								 VRL2.RDB$VIEW_NAME = RFL2.RDB$RELATION_NAME AND
+								 VRL2.RDB$VIEW_CONTEXT = RFL2.RDB$VIEW_CONTEXT AND
+								 REL2.RDB$SCHEMA_NAME = VRL2.RDB$RELATION_SCHEMA_NAME AND
+								 REL2.RDB$PACKAGE_NAME MISSING AND
+								 REL2.RDB$RELATION_NAME = VRL2.RDB$RELATION_NAME
 							{
 								const MetaName relation2Owner(REL2.RDB$OWNER_NAME);
 

src/jrd/dfw.epp

@@ -2147,8 +2147,7 @@ static bool store_view_context_type(thread_db* tdbb, SSHORT phase, DeferredWork*
 	{
 	case 1:
 		{
-			// If RDB$PACKAGE_NAME IS NOT NULL or no record is found in RDB$RELATIONS,
-			// the context is a procedure;
+			// If no record is found in RDB$RELATIONS, the context is a procedure;
 			ViewContextType vct = VCT_PROCEDURE;
 
 			AutoRequest handle1;

src/jrd/idx.h

@@ -459,7 +459,8 @@ static inline constexpr struct ini_idx_t indices[] =
 	// define index RDB$INDEX_84 for RDB$VIEW_RELATIONS RDB$RELATION_SCHEMA_NAME, RDB$RELATION_NAME;
 	INDEX(84, rel_vrel, 0, 2, ODS_14_0)
 		SEGMENT(f_vrl_rname_schema, idx_metadata),	// schema name
-		SEGMENT(f_vrl_rname, idx_metadata)		// base relation name
+		SEGMENT(f_vrl_pkg_name, idx_metadata),		// package name
+		SEGMENT(f_vrl_rname, idx_metadata)			// base relation name
 	}},
 	// define index RDB$INDEX_85 for RDB$TRIGGER_MESSAGES RDB$SCHEMA_NAME, RDB$TRIGGER_NAME;
 	INDEX(85, rel_msgs, 0, 2, ODS_14_0)