mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Use schema qualification while accessing the catalog objects. Fixes #3976
This commit is contained in:
committed by
Akshay Joshi
parent
8cf7c41ad9
commit
a2be30d257
@@ -30,7 +30,7 @@ SELECT
|
||||
{% if is_ppas_database %}
|
||||
CASE WHEN n.nspparent <> 0 THEN n.oid ELSE 0 END AS pkg,
|
||||
CASE WHEN n.nspparent <> 0 THEN n.nspname ELSE '' END AS pkgname,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_catalog.pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.oid ELSE n.oid END AS schema,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.nspname ELSE n.nspname END AS schemaname,
|
||||
NOT (l.lanname = 'edbspl' AND protype = '1') AS isfunc,
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{### To fetch trigger function information ###}
|
||||
SELECT t.oid, t.xmin, t.*, relname, CASE WHEN relkind = 'r' THEN TRUE ELSE FALSE END AS parentistable, nspname, des.description, l.lanname, p.prosrc,
|
||||
COALESCE(substring(pg_get_triggerdef(t.oid), 'WHEN (.*) EXECUTE PROCEDURE'), substring(pg_get_triggerdef(t.oid), 'WHEN (.*) \$trigger')) AS whenclause
|
||||
FROM pg_trigger t
|
||||
JOIN pg_class cl ON cl.oid=tgrelid
|
||||
JOIN pg_namespace na ON na.oid=relnamespace
|
||||
LEFT OUTER JOIN pg_description des ON (des.objoid=t.oid AND des.classoid='pg_trigger'::regclass)
|
||||
LEFT OUTER JOIN pg_proc p ON p.oid=t.tgfoid
|
||||
LEFT OUTER JOIN pg_language l ON l.oid=p.prolang
|
||||
COALESCE(pg_catalog.substring(pg_catalog.pg_get_triggerdef(t.oid), 'WHEN (.*) EXECUTE PROCEDURE'), pg_catalog.substring(pg_catalog.pg_get_triggerdef(t.oid), 'WHEN (.*) \$trigger')) AS whenclause
|
||||
FROM pg_catalog.pg_trigger t
|
||||
JOIN pg_catalog.pg_class cl ON cl.oid=tgrelid
|
||||
JOIN pg_catalog.pg_namespace na ON na.oid=relnamespace
|
||||
LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_trigger'::regclass)
|
||||
LEFT OUTER JOIN pg_catalog.pg_proc p ON p.oid=t.tgfoid
|
||||
LEFT OUTER JOIN pg_catalog.pg_language l ON l.oid=p.prolang
|
||||
WHERE NOT tgisinternal
|
||||
AND tgrelid = {{table_id}}::oid AND t.oid = {{trigger_id}}::oid
|
||||
ORDER BY tgname
|
||||
|
||||
@@ -31,7 +31,7 @@ SELECT
|
||||
{% if is_ppas_database %}
|
||||
CASE WHEN n.nspparent <> 0 THEN n.oid ELSE 0 END AS pkg,
|
||||
CASE WHEN n.nspparent <> 0 THEN n.nspname ELSE '' END AS pkgname,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_catalog.pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.oid ELSE n.oid END AS schema,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.nspname ELSE n.nspname END AS schemaname,
|
||||
NOT (l.lanname = 'edbspl' AND protype = '1') AS isfunc,
|
||||
@@ -61,4 +61,4 @@ FROM
|
||||
{% endif %}
|
||||
{% if fid %}
|
||||
WHERE p.oid = {{fid}}::oid;
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -31,7 +31,7 @@ SELECT
|
||||
{% if is_ppas_database %}
|
||||
CASE WHEN n.nspparent <> 0 THEN n.oid ELSE 0 END AS pkg,
|
||||
CASE WHEN n.nspparent <> 0 THEN n.nspname ELSE '' END AS pkgname,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN (SELECT oid FROM pg_catalog.pg_proc WHERE pronamespace=n.oid AND proname='cons') ELSE 0 END AS pkgconsoid,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.oid ELSE n.oid END AS schema,
|
||||
CASE WHEN n.nspparent <> 0 THEN g.nspname ELSE n.nspname END AS schemaname,
|
||||
NOT (l.lanname = 'edbspl' AND protype = '1') AS isfunc,
|
||||
@@ -61,4 +61,4 @@ FROM
|
||||
{% endif %}
|
||||
{% if fid %}
|
||||
WHERE p.oid = {{fid}}::oid;
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user