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

Allow debugging of functions in packages. Fixes #1948

Browse Source
This commit is contained in:
Murtuza Zabuawala 2017-07-03 16:30:12 +01:00 committed by Dave Page
parent 070a9c077e
commit 5c7dcaba81
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py
View File

@ -291,7 +291,8 @@ class EdbFuncView(PGChildNodeView, DataTypeReader):
row['oid'], row['oid'],
pkgid, pkgid,
row['name'], row['name'],
icon="icon-" + self.node_type icon="icon-" + self.node_type,
funcowner=row['funcowner']
), ),
status=200 status=200
) )
@ -302,7 +303,8 @@ class EdbFuncView(PGChildNodeView, DataTypeReader):
row['oid'], row['oid'],
pkgid, pkgid,
row['name'], row['name'],
icon="icon-" + self.node_type icon="icon-" + self.node_type,
funcowner=row['funcowner']
)) ))
return make_json_response( return make_json_response(

3
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/9.1_plus/node.sql
View File

@ -1,5 +1,6 @@
SELECT pg_proc.oid, SELECT pg_proc.oid,
pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name,
pg_get_userbyid(proowner) AS funcowner
FROM pg_proc, pg_namespace FROM pg_proc, pg_namespace
WHERE format_type(prorettype, NULL) != 'void' WHERE format_type(prorettype, NULL) != 'void'
{% if fnid %} {% if fnid %}

3
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/9.2_plus/node.sql
View File

@ -1,5 +1,6 @@
SELECT pg_proc.oid, SELECT pg_proc.oid,
pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name,
pg_get_userbyid(proowner) AS funcowner
FROM pg_proc, pg_namespace FROM pg_proc, pg_namespace
WHERE format_type(prorettype, NULL) != 'void' WHERE format_type(prorettype, NULL) != 'void'
{% if fnid %} {% if fnid %}

3
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/9.1_plus/node.sql
View File

@ -1,5 +1,6 @@
SELECT pg_proc.oid, SELECT pg_proc.oid,
pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name,
pg_get_userbyid(proowner) AS funcowner
FROM pg_proc, pg_namespace FROM pg_proc, pg_namespace
WHERE format_type(prorettype, NULL) = 'void' WHERE format_type(prorettype, NULL) = 'void'
{% if fnid %} {% if fnid %}

3
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/9.2_plus/node.sql
View File

@ -1,5 +1,6 @@
SELECT pg_proc.oid, SELECT pg_proc.oid,
pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name pg_proc.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pg_proc.oid), '') || ')' AS name,
pg_get_userbyid(proowner) AS funcowner
FROM pg_proc, pg_namespace FROM pg_proc, pg_namespace
WHERE format_type(prorettype, NULL) = 'void' WHERE format_type(prorettype, NULL) = 'void'
{% if fnid %} {% if fnid %}

8
web/pgadmin/tools/debugger/templates/debugger/js/debugger.js
View File

@ -126,8 +126,14 @@ define([
&& !treeInfo.server.user.is_superuser) && !treeInfo.server.user.is_superuser)
return false; return false;
// Fetch object owner
var obj_owner = treeInfo.function && treeInfo.function.funcowner ||
treeInfo.procedure && treeInfo.procedure.funcowner ||
treeInfo.edbfunc && treeInfo.edbfunc.funcowner ||
treeInfo.edbproc && treeInfo.edbproc.funcowner;
// Must be a super user or object owner to create breakpoints of any kind // Must be a super user or object owner to create breakpoints of any kind
if (!(treeInfo.server.user.is_superuser || treeInfo.function.funcowner == treeInfo.server.user.name)) if (!(treeInfo.server.user.is_superuser || obj_owner == treeInfo.server.user.name))
return false; return false;
// For trigger node, language will be undefined - we should allow indirect debugging for trigger node // For trigger node, language will be undefined - we should allow indirect debugging for trigger node