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

Ensure Javascript errors during Query Tool execution are reported as such and not as Ajax errors.. Fixes #4564

Browse Source
This commit is contained in:
Aditya Toshniwal
2019-10-29 15:51:28 +00:00
committed by Dave Page
parent 18b7483cc4
commit 4f9d2de8cd
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
web/pgadmin/static/js/sqleditor/execute_query.js
View File

@@ -169,22 +169,28 @@ class ExecuteQuery {
self.enableSQLEditorButtons();
}
if (ExecuteQuery.wasConnectionLostToPythonServer(error.response)) {
if(error.response) {
if(ExecuteQuery.wasConnectionLostToPythonServer(error.response)) {
self.handleConnectionToServerLost();
return;
}
const errorData = error.response.data;
if (self.userManagement.isPgaLoginRequired(errorData)) {
return self.userManagement.pgaLogin();
}
let msg = ExecuteQuery.extractErrorMessage(errorData);
self.sqlServerObject.update_msg_history(false, msg);
// Highlight the error in the sql panel
self.sqlServerObject._highlight_error(msg);
} else if(error.request) {
self.handleConnectionToServerLost();
return;
} else {
console.error(error);
}
const errorData = error.response.data;
if (self.userManagement.isPgaLoginRequired(errorData)) {
return self.userManagement.pgaLogin();
}
let msg = ExecuteQuery.extractErrorMessage(errorData);
self.sqlServerObject.update_msg_history(false, msg);
// Highlight the error in the sql panel
self.sqlServerObject._highlight_error(msg);
});
}