From 64aa739224b3050359440174cefe391bfe77d072 Mon Sep 17 00:00:00 2001
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Mon, 20 Mar 2023 18:20:25 +0530
Subject: [PATCH] Fix SQLEditor Notifier and InetLoader issue.

---
 .../sqleditor/static/js/components/sections/ResultSet.jsx   | 6 +++---
 web/pgadmin/utils/driver/psycopg3/typecast.py               | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index 2be6f003e..a1540e4ef 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -212,6 +212,9 @@ export class ResultSetUtils {
           this.eventBus.fireEvent(QUERY_TOOL_EVENTS.SET_LIMIT_VALUE, httpMessageData.data.limit);
           this.eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_SET_SQL, httpMessageData.data.sql, false);
         }
+        if(httpMessageData.data.notifies) {
+          this.eventBus.fireEvent(QUERY_TOOL_EVENTS.PUSH_NOTICE, httpMessageData.data.notifies);
+        }
         return true;
       } else {
         this.eventBus.fireEvent(QUERY_TOOL_EVENTS.EXECUTION_END);
@@ -233,9 +236,6 @@ export class ResultSetUtils {
           this.eventBus.fireEvent(QUERY_TOOL_EVENTS.HIGHLIGHT_ERROR, httpMessageData.data.result);
         }
       }
-      if(httpMessageData.data.notifies) {
-        this.eventBus.fireEvent(QUERY_TOOL_EVENTS.PUSH_NOTICE, httpMessageData.data.notifies);
-      }
     } catch(e) {
       this.eventBus.fireEvent(QUERY_TOOL_EVENTS.EXECUTION_END);
       this.eventBus.fireEvent(QUERY_TOOL_EVENTS.HANDLE_API_ERROR,
diff --git a/web/pgadmin/utils/driver/psycopg3/typecast.py b/web/pgadmin/utils/driver/psycopg3/typecast.py
index f3ebdd05a..03be07169 100644
--- a/web/pgadmin/utils/driver/psycopg3/typecast.py
+++ b/web/pgadmin/utils/driver/psycopg3/typecast.py
@@ -205,6 +205,7 @@ class pgAdminInetLoader(InetLoader):
 
 # The new classes can be registered globally, on a connection, on a cursor
 psycopg.adapters.register_loader("inet", pgAdminInetLoader)
+psycopg.adapters.register_loader("cidr", pgAdminInetLoader)
 
 
 class pgAdminByteaLoader(Loader):