From b8072bd630a478f19cc1887796d787137593f29b Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 18 Oct 2021 15:50:42 +0530
Subject: [PATCH] Fixed an issue where the blank string is stored instead of
 NULL in the server table of SQLite database. Fixes #6915

---
 docs/en_US/release_notes_6_1.rst                      | 1 +
 web/pgadmin/browser/server_groups/servers/__init__.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/en_US/release_notes_6_1.rst b/docs/en_US/release_notes_6_1.rst
index 0e9669261..ee65897bf 100644
--- a/docs/en_US/release_notes_6_1.rst
+++ b/docs/en_US/release_notes_6_1.rst
@@ -39,3 +39,4 @@ Bug fixes
 | `Issue #6905 <https://redmine.postgresql.org/issues/6905>`_ -  Fixed an issue where the users are unable to load the databases behind an HTTP reverse proxy.
 | `Issue #6908 <https://redmine.postgresql.org/issues/6908>`_ -  Fixed an issue where each click to refresh the collection node, the number of objects decreasing by tens or more.
 | `Issue #6912 <https://redmine.postgresql.org/issues/6912>`_ -  Fixed browser tree sort order regression issue.
+| `Issue #6915 <https://redmine.postgresql.org/issues/6915>`_ -  Fixed an issue where the blank string is stored instead of NULL in the server table of SQLite database.
diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index fb7ff12c1..9b2ead777 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -811,6 +811,9 @@ class ServerNode(PGChildNodeView):
     @staticmethod
     def _update_server_details(server, sharedserver,
                                config_param_map, arg, value):
+        if value == '':
+            value = None
+
         if server.shared and server.user_id != current_user.id:
             setattr(sharedserver, config_param_map[arg], value)
         else: