From 07f2df7e664d656018e3317765b0cd6ad6d43ab9 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 31 Mar 2021 12:08:01 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=C2=A0cannot=20unpack=20non-iterable=20res?= =?UTF-8?q?ponse=20object=20error=20when=20selecting=20any=20partition.=20?= =?UTF-8?q?Fixes=20#6344?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en_US/release_notes_5_2.rst | 1 + .../tables/templates/partitions/sql/pg/12_plus/properties.sql | 4 ++-- .../servers/roles/templates/roles/sql/9.1_plus/properties.sql | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en_US/release_notes_5_2.rst b/docs/en_US/release_notes_5_2.rst index d9162831a..e7dd2a341 100644 --- a/docs/en_US/release_notes_5_2.rst +++ b/docs/en_US/release_notes_5_2.rst @@ -19,4 +19,5 @@ Bug fixes ********* | `Issue #6293 `_ - Fixed an issue where the procedure creation is failed when providing the Volatility option. +| `Issue #6344 `_ - Fixed cannot unpack non-iterable response object error when selecting any partition. | `Issue #6356 `_ - Mark the Apache HTTPD config file as such in the web DEB and RPM packages. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql index 94a44f1b0..817534100 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql @@ -6,14 +6,14 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r END) as spcname, (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as parent_schema, nsp.nspname as schema, - pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, + pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, EXISTS(select 1 FROM pg_catalog.pg_trigger JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' JOIN pg_catalog.pg_proc pc ON pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion' WHERE tgrelid=rel.oid) AS isrepl, (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT pg_catalog.ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN + (SELECT ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(c.relname) ELSE pg_catalog.quote_ident(c.relname) END AS inherited_tables FROM pg_catalog.pg_inherits i diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql index 2e653746c..a48cf73f4 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql @@ -1,7 +1,7 @@ SELECT r.oid, r.*, pg_catalog.shobj_description(r.oid, 'pg_authid') AS description, - pg_catalog.ARRAY( + ARRAY( SELECT CASE WHEN am.admin_option THEN '1' ELSE '0' END || rm.rolname FROM