From 1c5cb63affc20cb87bed2e86bca0f275df3856f2 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Thu, 3 Dec 2020 10:40:52 +0530
Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20shared=20servers?=
 =?UTF-8?q?=20import=C2=A0is=20failing.=20Fixes=20#6022?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en_US/release_notes_4_29.rst | 1 +
 web/setup.py                      | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/en_US/release_notes_4_29.rst b/docs/en_US/release_notes_4_29.rst
index d60fb696d..6e1de548b 100644
--- a/docs/en_US/release_notes_4_29.rst
+++ b/docs/en_US/release_notes_4_29.rst
@@ -31,3 +31,4 @@ Bug fixes
 | `Issue #5992 <https://redmine.postgresql.org/issues/5992>`_ -  Fixed an issue where escape character is shown when the server/database name has some special characters.
 | `Issue #5998 <https://redmine.postgresql.org/issues/5998>`_ -  Fixed an issue where schema diff doesn't show the result of compare if source schema has tables with RLS.
 | `Issue #6003 <https://redmine.postgresql.org/issues/6003>`_ -  Fixed an issue where an illegal argument is showing for trigger SQL when a trigger is created for View.
+| `Issue #6022 <https://redmine.postgresql.org/issues/6022>`_ -  Fixed an issue where shared servers import is failing.
diff --git a/web/setup.py b/web/setup.py
index fbc7f1e04..3f6676660 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -346,6 +346,9 @@ def load_servers(args):
             new_server.tunnel_authentication = \
                 obj.get("TunnelAuthentication", None)
 
+            new_server.shared = \
+                obj.get("Shared", None)
+
             db.session.add(new_server)
 
             try: