IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Query Tool error messages for psycopg3 driver.

Browse Source
This commit is contained in:
Khushboo Vashi 2023-02-22 14:07:05 +05:30 committed by GitHub
parent 9abbd30790
commit b640df5bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 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

@ -782,7 +782,7 @@ export function ResultSet() {
setSelectedRows(new Set()); setSelectedRows(new Set());
setSelectedColumns(new Set()); setSelectedColumns(new Set());
setLoaderText(gettext('Waiting for the query to complete...')); setLoaderText(gettext('Waiting for the query to complete...'));
await rsu.current.startExecution( return await rsu.current.startExecution(
query, explainObject, query, explainObject,
()=>{ ()=>{
setColumns([]); setColumns([]);
@ -829,8 +829,8 @@ export function ResultSet() {
} }
); );
} else { } else {
await yesCallback(); let goForPoll = await yesCallback();
pollCallback(); if (goForPoll) pollCallback();
} }
}; };

2
web/pgadmin/utils/driver/psycopg3/connection.py
View File

@ -1635,7 +1635,7 @@ Failed to reset the connection to the server due to following error:
# Do not append if error starts with `ERROR:` as most pg related # Do not append if error starts with `ERROR:` as most pg related
# error starts with `ERROR:` # error starts with `ERROR:`
if not errmsg.startswith('ERROR:'): if not errmsg.startswith('ERROR:'):
errmsg = gettext('ERROR: ') + errmsg + '\n\n' errmsg = gettext('ERROR: ') + errmsg + ' \n\n'
if exception_obj.diag.severity is not None \ if exception_obj.diag.severity is not None \
and exception_obj.diag.message_primary is not None: and exception_obj.diag.message_primary is not None: