Postfix for #4203 - thanks to Pavel Zotov.

FirebirdSQL · Jan 9, 2024 · 252a675 · 252a675
1 parent 597b267
commit 252a675
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp
@@ -10694,6 +10694,8 @@ void MappingNode::runInSecurityDb(SecDbContext* secDbContext)
 		break;
 	case MAP_DROP:
 		ddl = "DROP MAPPING ";
+		if (silentDrop)
+			ddl += "IF EXISTS ";
 		break;
 	case MAP_RPL:
 		ddl = "CREATE OR ALTER MAPPING ";

diff --git a/src/dsql/PackageNodes.epp b/src/dsql/PackageNodes.epp
@@ -995,6 +995,12 @@ void DropPackageBodyNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScra
 
 	if (!found)
 	{
+		if (silent)
+		{
+			savePoint.release();
+			return;
+		}
+
 		status_exception::raise(
 			Arg::Gds(isc_no_meta_update) <<
 			Arg::Gds(isc_dyn_package_not_found) << Arg::Str(name));