pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SQLEditor Notifier and InetLoader issue.

pull/5975/head
Khushboo Vashi 2023-03-20 18:20:25 +05:30 committed by GitHub
parent 366dd3a973
commit 64aa739224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
View File

@ -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,

1
web/pgadmin/utils/driver/psycopg3/typecast.py
View File

@ -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):