From 9ed2506062372d650cf4dc5c8d8eb86a3668526e Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 10 Mar 2022 13:59:08 +0530
Subject: [PATCH] Fixed a schema diff issue where string separator
 '_$PGADMIN$_' is visible for identical user mappings. Fixes #7228

---
 docs/en_US/release_notes.rst                  |  1 +
 docs/en_US/release_notes_6_7.rst              | 21 +++++++++++++++++++
 .../tools/schema_diff/directory_compare.py    |  6 +++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 docs/en_US/release_notes_6_7.rst

diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index 8f2babe3d..4e03baff0 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_6_7
    release_notes_6_6
    release_notes_6_5
    release_notes_6_4
diff --git a/docs/en_US/release_notes_6_7.rst b/docs/en_US/release_notes_6_7.rst
new file mode 100644
index 000000000..cde01c387
--- /dev/null
+++ b/docs/en_US/release_notes_6_7.rst
@@ -0,0 +1,21 @@
+************
+Version 6.7
+************
+
+Release date: 2022-04-07
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.6.
+
+New features
+************
+
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+| `Issue #7228 <https://redmine.postgresql.org/issues/7228>`_ -  Fixed a schema diff issue where string separator '_$PGADMIN$_' is visible for identical user mappings.
diff --git a/web/pgadmin/tools/schema_diff/directory_compare.py b/web/pgadmin/tools/schema_diff/directory_compare.py
index 7ea0c374f..048855736 100644
--- a/web/pgadmin/tools/schema_diff/directory_compare.py
+++ b/web/pgadmin/tools/schema_diff/directory_compare.py
@@ -264,11 +264,15 @@ def _get_identical_and_different_list(intersect_keys, source_dict, target_dict,
             "Schema Diff: Target Dict: {0}".format(dict2[key]))
 
         if are_dictionaries_identical(dict1[key], dict2[key], ignore_keys):
+            title = key
+            if node == 'user_mapping':
+                title = _get_user_mapping_name(key)
+
             identical.append({
                 'id': count,
                 'type': node,
                 'label': node_label,
-                'title': key,
+                'title': title,
                 'oid': source_object_id,
                 'source_oid': source_object_id,
                 'target_oid': target_object_id,