From 15b0b297dcde81cc5e1c38cbd4ea761e27f442bd Mon Sep 17 00:00:00 2001
From: AlexPeshkoff <alexander.peshkoff@gmail.com>
Date: Wed, 21 Jun 2023 19:22:20 +0300
Subject: [PATCH] Postfix for #7046: Make ability to add comment to mapping
 ('COMMENT ON MAPPING ... IS ...'); show and extract comments on mappings in
 isql

---
 src/isql/show.epp | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/isql/show.epp b/src/isql/show.epp
index a5bb7b778a1..9975167a7e8 100644
--- a/src/isql/show.epp
+++ b/src/isql/show.epp
@@ -3555,6 +3555,49 @@ static processing_state show_comments(const commentMode showextract, const char*
 		return ps_ERR;
 	END_ERROR
 
+	if (isqlGlob.major_ods >= ODS_VERSION12)
+	{
+		FOR PACK IN RDB$PACKAGES
+			WITH PACK.RDB$DESCRIPTION NOT MISSING
+			AND (PACK.RDB$SYSTEM_FLAG EQ 0 OR PACK.RDB$SYSTEM_FLAG MISSING)
+			SORTED BY PACK.RDB$PACKAGE_NAME
+
+			show_comment("PACKAGE", NULL, PACK.RDB$PACKAGE_NAME, NULL, &PACK.RDB$DESCRIPTION,
+				showextract, first ? banner : 0);
+			first = false;
+		END_FOR
+		ON_ERROR
+			ISQL_errmsg(fbStatus);
+			return ps_ERR;
+		END_ERROR
+
+		FOR M IN RDB$AUTH_MAPPING
+			WITH M.RDB$DESCRIPTION NOT MISSING
+			AND (M.RDB$SYSTEM_FLAG EQ 0 OR M.RDB$SYSTEM_FLAG MISSING)
+			SORTED BY M.RDB$MAP_NAME
+
+			show_comment("MAPPING", NULL, M.RDB$MAP_NAME, NULL, &M.RDB$DESCRIPTION,
+				showextract, first ? banner : 0);
+			first = false;
+		END_FOR
+		ON_ERROR
+			ISQL_errmsg(fbStatus);
+			return ps_ERR;
+		END_ERROR
+
+		FOR M IN SEC$GLOBAL_AUTH_MAPPING
+			WITH M.SEC$DESCRIPTION NOT MISSING
+			SORTED BY M.SEC$MAP_NAME
+
+			show_comment("GLOBAL MAPPING", NULL, M.SEC$MAP_NAME, NULL, &M.SEC$DESCRIPTION,
+				showextract, first ? banner : 0);
+			first = false;
+		END_FOR
+		ON_ERROR
+			ISQL_errmsg(fbStatus);
+			return ps_ERR;
+		END_ERROR
+	}
 	return first ? OBJECT_NOT_FOUND : SKIP;
 }