Fix SQLEditor Notifier and InetLoader issue.

pgadmin-org · Mar 20, 2023 · 64aa739 · 64aa739
1 parent 366dd3a
commit 64aa739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -205,6 +205,7 @@ def load(self, data):
 
 # 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):