From 77ae220f1e85ca7809793db2d342bc3165d82b13 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Thu, 10 Mar 2016 14:56:36 +0530 Subject: [PATCH] Resolved typos in SQL templates for PPAS Thanks Khushboo Vashi for reporting. --- .../templates/catalog/ppas/9.1_plus/sql/properties.sql | 5 +---- .../templates/catalog/ppas/9.2_plus/sql/properties.sql | 2 +- .../schemas/templates/catalog/ppas/macros/catalogs.sql | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql index bd494c5c2..cc435e689 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql @@ -1,9 +1,6 @@ {% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} SELECT - CASE - WHEN (nspname LIKE E'pg\\_temp\\_%') THEN 1 - WHEN (nspname LIKE E'pg\\_%') THEN 0 - ELSE 3 END AS nsptyp, + 2 AS nsptyp, nsp.nspname AS name, nsp.oid, array_to_string(nsp.nspacl::text[], ', ') as acl, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql index 9fe9404d1..1064237b6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql @@ -1,6 +1,6 @@ {% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} SELECT - 2 END AS nsptyp, + 2 AS nsptyp, nsp.nspname AS name, nsp.oid, array_to_string(nsp.nspacl::text[], ', ') as acl, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/macros/catalogs.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/macros/catalogs.sql index d9095bddd..3face6402 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/macros/catalogs.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/macros/catalogs.sql @@ -9,7 +9,7 @@ (SELECT 1 FROM pg_class WHERE relname = 'tables' AND relnamespace = {{ tbl }}.oid LIMIT 1)) OR ({{ tbl }}.nspname = 'dbo' OR {{ tbl }}.nspname = 'sys') OR - {{ tbl }}.nspname = 'dbms_job_procedure' AND EXISTS + ({{ tbl }}.nspname = 'dbms_job_procedure' AND EXISTS (SELECT 1 FROM pg_proc WHERE pronamespace = {{ tbl }}.oid and proname = 'run_job' LIMIT 1)) {%- endmacro %}