Merge branch 'work/gh-7428' into B3_0_Release

FirebirdSQL · Jan 23, 2023 · 2d751bc · 2d751bc
2 parents 98c0a41 + e7e2511
commit 2d751bc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/dsql/metd.epp b/src/dsql/metd.epp
@@ -843,9 +843,13 @@ dsql_udf* METD_get_function(jrd_tra* transaction, DsqlCompilerScratch* dsqlScrat
 
 		if (MET_dsql_cache_use(tdbb, SYM_udf, metaName.identifier, metaName.package))
 			userFunc->udf_flags |= UDF_dropped;
+	}
+
+	if (userFunc && (userFunc->udf_flags & UDF_dropped))
+		userFunc = NULL;
 
+	if (userFunc)
 		return userFunc;
-	}
 
 	// Now see if it is in the database
 
@@ -1204,9 +1208,13 @@ dsql_prc* METD_get_procedure(jrd_tra* transaction, DsqlCompilerScratch* dsqlScra
 
 		if (MET_dsql_cache_use(tdbb, SYM_procedure, metaName.identifier, metaName.package))
 			procedure->prc_flags |= PRC_dropped;
+	}
+
+	if (procedure && (procedure->prc_flags & PRC_dropped))
+		procedure = NULL;
 
+	if (procedure)
 		return procedure;
-	}
 
 	// now see if it is in the database