diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py
index 7d83ecb..ce36c6f 100644
--- a/web/pgadmin/tools/debugger/__init__.py
+++ b/web/pgadmin/tools/debugger/__init__.py
@@ -1354,9 +1354,18 @@ def poll_end_execution_result(trans_id):
if conn.connected():
statusmsg = conn.status_message()
+ if statusmsg and statusmsg == 'SELECT 1':
+ statusmsg = ''
status, result, col_info = conn.poll()
- if status == ASYNC_OK and session['functionData'][str(trans_id)]['language'] == 'edbspl':
+ if status == ASYNC_OK and \
+ not session['functionData'][str(trans_id)]['is_func'] and \
+ session['functionData'][str(trans_id)]['language'] == 'edbspl':
status = 'Success'
+ additional_msgs = conn.messages()
+ if len(additional_msgs) > 0:
+ additional_msgs = [msg.strip("\n") for msg in additional_msgs]
+ statusmsg = "
".join(additional_msgs) + "
" + \
+ statusmsg if statusmsg is not None else ''
return make_json_response(success=1, info=gettext("Execution Completed."),
data={'status': status, 'status_message': statusmsg})
if result:
@@ -1366,6 +1375,12 @@ def poll_end_execution_result(trans_id):
data={'status': status, 'status_message': result})
else:
status = 'Success'
+ additional_msgs = conn.messages()
+ if len(additional_msgs) > 0:
+ additional_msgs = [msg.strip("\n") for msg in additional_msgs]
+ statusmsg = "
".join(additional_msgs) + "
" + \
+ statusmsg if statusmsg is not None else ''
+
columns = []
# Check column info is available or not
if col_info is not None and len(col_info) > 0:
@@ -1381,6 +1396,14 @@ def poll_end_execution_result(trans_id):
'col_info': columns, 'status_message': statusmsg})
else:
status = 'Busy'
+ additional_msgs = conn.messages()
+ if len(additional_msgs) > 0:
+ additional_msgs = [msg.strip("\n") for msg in additional_msgs]
+ statusmsg = "
".join(additional_msgs) + "
" + \
+ statusmsg if statusmsg is not None else ''
+ return make_json_response(data={
+ 'status': status, 'result': result, 'status_message': statusmsg
+ })
else:
status = 'NotConnected'
result = gettext('Not connected to server or connection with the server has been closed.')
diff --git a/web/pgadmin/tools/debugger/static/css/debugger.css b/web/pgadmin/tools/debugger/static/css/debugger.css
index 4386775..e1177a8 100644
--- a/web/pgadmin/tools/debugger/static/css/debugger.css
+++ b/web/pgadmin/tools/debugger/static/css/debugger.css
@@ -67,3 +67,14 @@
.CodeMirror-foldgutter-folded:after {
content: "\25B6";
}
+
+/* To make font same as Query tool in messages tab */
+.messages {
+ white-space: pre-wrap;
+ font-family: monospace;
+ padding-top: 5px;
+ padding-left: 10px;
+ overflow: auto;
+ height: 100%;
+ font-size: 0.925em;
+}
\ No newline at end of file
diff --git a/web/pgadmin/tools/debugger/templates/debugger/js/direct.js b/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
index 452617b..6ff88c5 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
+++ b/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
@@ -164,6 +164,9 @@ define(
// Call function to create and update local variables ....
self.GetStackInformation(trans_id);
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
}
else if (res.data.status === 'NotConnected') {
Alertify.alert(
@@ -194,6 +197,13 @@ define(
// Call function to create and update local variables
self.AddLocalVariables(res.data.result);
self.AddParameters(res.data.result);
+ // If debug function is restarted then again start listener to read the updated messages.
+ if (pgTools.DirectDebug.debug_restarted) {
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
+ pgTools.DirectDebug.debug_restarted = false;
+ }
}
else if (res.data.status === 'NotConnected') {
Alertify.alert(
@@ -363,6 +373,20 @@ define(
},
+ // This function will update messages tab
+ update_messages: function(msg) {
+ var old_msgs='', new_msgs='';
+ old_msgs = pgTools.DirectDebug.messages_panel.$container.find('.messages').html();
+ if(old_msgs) {
+ new_msgs = (old_msgs + '\n' + msg)
+ .replace(/(?:\r\n|\r|\n)/g, '
') // Newlines with
+ .replace(/()+/g, '
'); // multiple
with single
+ } else {
+ new_msgs = msg;
+ }
+ pgTools.DirectDebug.messages_panel.$container.find('.messages').html(new_msgs);
+ },
+
/*
For the direct debugging, we need to check weather the functions execution is completed or not. After completion
of the debugging, we will stop polling the result until new execution starts.
@@ -411,7 +435,9 @@ define(
);
// Update the message tab of the debugger
- pgTools.DirectDebug.dbmsMessages.$elem.text(res.data.status_message);
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
// Execution completed so disable the buttons other than "Continue/Start" button because user can still
// start the same execution again.
@@ -420,6 +446,7 @@ define(
self.enable('step_into', false);
self.enable('toggle_breakpoint', false);
self.enable('clear_all_breakpoints', false);
+ self.enable('continue', true);
}
else {
// Call function to create and update local variables ....
@@ -439,7 +466,9 @@ define(
);
// Update the message tab of the debugger
- pgTools.DirectDebug.messages_panel.$container.find('.messages').text(res.data.status_message);
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
// Execution completed so disable the buttons other than "Continue/Start" button because user can still
// start the same execution again.
@@ -448,12 +477,17 @@ define(
self.enable('step_into', false);
self.enable('toggle_breakpoint', false);
self.enable('clear_all_breakpoints', false);
+ self.enable('continue', true);
}
}
}
else if (res.data.status === 'Busy') {
// If status is Busy then poll the result by recursive call to the poll function
- //self.poll_end_execution_result(trans_id);
+ self.poll_end_execution_result(trans_id);
+ // Update the message tab of the debugger
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
}
else if (res.data.status === 'NotConnected') {
Alertify.alert(
@@ -473,7 +507,11 @@ define(
function() { }
);
- pgTools.DirectDebug.messages_panel.$container.find('.messages').text(res.data.status_message);
+ // Update the message tab of the debugger
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
+
pgTools.DirectDebug.messages_panel.focus();
// Execution completed so disable the buttons other than "Continue/Start" button because user can still
@@ -483,6 +521,7 @@ define(
self.enable('step_into', false);
self.enable('toggle_breakpoint', false);
self.enable('clear_all_breakpoints', false);
+ self.enable('continue', true);
}
},
error: function(e) {
@@ -498,13 +537,24 @@ define(
Restart: function(trans_id) {
- var baseUrl = "{{ url_for('debugger.index') }}" + "restart/" + trans_id;
+ var self = this,
+ baseUrl = "{{ url_for('debugger.index') }}" + "restart/" + trans_id;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
+
$.ajax({
url: baseUrl,
success: function(res) {
// Restart the same function debugging with previous arguments
var restart_dbg = res.data.restart_debug ? 1 : 0;
+ if (restart_dbg) {
+ pgTools.DirectDebug.debug_restarted = true;
+ }
/*
Need to check if restart debugging really require to open the input dialog ?
@@ -522,6 +572,9 @@ define(
url: baseUrl,
method: 'GET',
success: function(res) {
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
},
error: function(e) {
Alertify.alert(
@@ -546,6 +599,12 @@ define(
// Continue the execution until the next breakpoint
Continue: function(trans_id) {
var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
//Check first if previous execution was completed or not
if (pgTools.DirectDebug.direct_execution_completed &&
@@ -562,9 +621,6 @@ define(
success: function(res) {
if (res.data.status) {
self.poll_result(trans_id);
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
- }
}
else {
Alertify.alert(
@@ -583,6 +639,12 @@ define(
Step_over: function(trans_id) {
var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
// Make ajax call to listen the database message
var baseUrl = "{{ url_for('debugger.index') }}" + "execute_query/" + trans_id + "/" + "step_over";
@@ -593,9 +655,6 @@ define(
success: function(res) {
if (res.data.status) {
self.poll_result(trans_id);
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
- }
}
else {
Alertify.alert(
@@ -613,6 +672,12 @@ define(
Step_into: function(trans_id) {
var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
// Make ajax call to listen the database message
var baseUrl = "{{ url_for('debugger.index') }}" + "execute_query/" + trans_id + "/" + "step_into";
@@ -623,9 +688,6 @@ define(
success: function(res) {
if (res.data.status) {
self.poll_result(trans_id);
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
- }
}
else {
Alertify.alert(
@@ -643,6 +705,12 @@ define(
Stop: function(trans_id) {
var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
// Make ajax call to listen the database message
var baseUrl = "{{ url_for('debugger.index') }}" + "execute_query/" + trans_id + "/" + "abort_target";
@@ -665,12 +733,8 @@ define(
);
//Disable the buttons other than continue button. If user wants to again then it should allow to debug again...
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('continue', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
+ self.enable('continue', true);
+
}
else if (res.data.status === 'NotConnected') {
Alertify.alert(
@@ -688,6 +752,13 @@ define(
toggle_breakpoint: function(trans_id) {
var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
+
var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
var baseUrl = '';
@@ -720,6 +791,12 @@ define(
return marker;
}());
}
+ self.enable('stop', true);
+ self.enable('step_over', true);
+ self.enable('step_into', true);
+ self.enable('toggle_breakpoint', true);
+ self.enable('clear_all_breakpoints', true);
+ self.enable('continue', true);
}
else if (res.data.status === 'NotConnected') {
Alertify.alert(
@@ -736,14 +813,20 @@ define(
},
clear_all_breakpoint: function(trans_id) {
- var self = this;
-
- var br_list = self.GetBreakpointInformation(trans_id);
+ var self = this,
+ br_list = self.GetBreakpointInformation(trans_id);
// If there is no break point to clear then we should return from here.
if ((br_list.length == 1) && (br_list[0].linenumber == -1))
return;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
+
var breakpoint_list = new Array();
for (i = 0; i < br_list.length; i++) {
@@ -771,6 +854,12 @@ define(
}
}
}
+ self.enable('stop', true);
+ self.enable('step_over', true);
+ self.enable('step_into', true);
+ self.enable('toggle_breakpoint', true);
+ self.enable('clear_all_breakpoints', true);
+ self.enable('continue', true);
},
error: function(e) {
Alertify.alert(
@@ -1204,6 +1293,7 @@ define(
this.first_time_indirect_debug = false;
this.direct_execution_completed = false;
this.polling_timeout_idle = false;
+ this.debug_restarted = false;
var docker = this.docker = new wcDocker(
'#container', {