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 debugging of procedures in EPAS packages. Fixes #3457

Browse Source
This commit is contained in:
Murtuza Zabuawala
2018-06-29 15:20:33 +01:00
committed by Dave Page
parent fb1ef9ac0b
commit b390c033cf
5 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/pgadmin/tools/debugger/static/js/debugger.js
View File

@@ -2,10 +2,11 @@ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'alertify', 'sources/pgadmin', 'pgadmin.browser',
'backbone', 'pgadmin.backgrid', 'codemirror', 'pgadmin.backform',
'pgadmin.tools.debugger.ui', 'wcdocker', 'pgadmin.browser.frame',
'pgadmin.tools.debugger.ui', 'pgadmin.tools.debugger.utils',
'wcdocker', 'pgadmin.browser.frame',
], function(
gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid,
CodeMirror, Backform, get_function_arguments
CodeMirror, Backform, get_function_arguments, debuggerUtils
) {
var pgTools = pgAdmin.Tools = pgAdmin.Tools || {},
wcDocker = window.wcDocker;
@@ -337,7 +338,7 @@ define([
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
'func_id': treeInfo.procedure._id,
'func_id': debuggerUtils.getProcedureId(treeInfo),
}
);
} else if (d._type == 'trigger_function') {
@@ -482,7 +483,7 @@ define([
'sid': treeInfo.server._id,
'did': treeInfo.database._id,
'scid': treeInfo.schema._id,
'func_id': treeInfo.procedure._id,
'func_id': debuggerUtils.getProcedureId(treeInfo),
}
);
}

13
web/pgadmin/tools/debugger/static/js/debugger_utils.js
View File

@@ -18,6 +18,19 @@ function setFocusToDebuggerEditor(editor, command) {
}
}
function getProcedureId(treeInfoObject) {
let objectId;
if(treeInfoObject) {
if (treeInfoObject.procedure && treeInfoObject.procedure._id) {
objectId = treeInfoObject.procedure._id;
} else if (treeInfoObject.edbproc && treeInfoObject.edbproc._id) {
objectId = treeInfoObject.edbproc._id;
}
}
return objectId;
}
module.exports = {
setFocusToDebuggerEditor: setFocusToDebuggerEditor,
getProcedureId: getProcedureId,
};