From 7b9504bdfb729ce22091271c1c91e70c3475f7b9 Mon Sep 17 00:00:00 2001 From: Pradip Parkale Date: Tue, 20 Oct 2020 15:57:32 +0530 Subject: [PATCH] Fixed an issue where the suffix for Toast table size is not visible in the Statistics tab. Fixes #5895 --- docs/en_US/release_notes_4_28.rst | 1 + .../schemas/tables/templates/tables/sql/9.1_plus/stats.sql | 4 ++-- .../schemas/tables/templates/tables/sql/9.2_plus/stats.sql | 4 ++-- .../schemas/tables/templates/tables/sql/default/stats.sql | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/en_US/release_notes_4_28.rst b/docs/en_US/release_notes_4_28.rst index b0062542b..3bea1dbef 100644 --- a/docs/en_US/release_notes_4_28.rst +++ b/docs/en_US/release_notes_4_28.rst @@ -19,4 +19,5 @@ Bug fixes ********* | `Issue #5858 `_ - Ensure that search object functionality works with case insensitive string. +| `Issue #5895 `_ - Fixed an issue where the suffix for Toast table size is not visible in the Statistics tab. | `Issue #5911 `_ - Ensure that macros should be run on the older version of Safari and Chrome. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql index e8dab7ad0..ea428ccf2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql @@ -26,9 +26,9 @@ SELECT pg_stat_get_analyze_count({{ tid }}::oid) AS {{ conn|qtIdent(_('Analyze counter')) }}, pg_stat_get_autoanalyze_count({{ tid }}::oid) AS {{ conn|qtIdent(_('Autoanalyze counter')) }}, pg_relation_size(stat.relid) AS {{ conn|qtIdent(_('Table size')) }}, - CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_relation_size(cl.reltoastrelid) + CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_size_pretty(pg_relation_size(cl.reltoastrelid) + COALESCE((SELECT SUM(pg_relation_size(indexrelid)) - FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0) + FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0)) END AS {{ conn|qtIdent(_('Toast table size')) }}, COALESCE((SELECT SUM(pg_relation_size(indexrelid)) FROM pg_index WHERE indrelid=stat.relid)::int8, 0) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql index 30137a8eb..dc038aee2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql @@ -26,9 +26,9 @@ SELECT analyze_count AS {{ conn|qtIdent(_('Analyze counter')) }}, autoanalyze_count AS {{ conn|qtIdent(_('Autoanalyze counter')) }}, pg_relation_size(stat.relid) AS {{ conn|qtIdent(_('Table size')) }}, - CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_relation_size(cl.reltoastrelid) + CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_size_pretty(pg_relation_size(cl.reltoastrelid) + COALESCE((SELECT SUM(pg_relation_size(indexrelid)) - FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0) + FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0)) END AS {{ conn|qtIdent(_('Toast table size')) }}, COALESCE((SELECT SUM(pg_relation_size(indexrelid)) FROM pg_index WHERE indrelid=stat.relid)::int8, 0) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql index f3b2e19e3..59c52a352 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql @@ -22,9 +22,9 @@ SELECT last_analyze AS {{ conn|qtIdent(_('Last analyze')) }}, last_autoanalyze AS {{ conn|qtIdent(_('Last autoanalyze')) }}, pg_relation_size(stat.relid) AS {{ conn|qtIdent(_('Table size')) }}, - CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_relation_size(cl.reltoastrelid) + CASE WHEN cl.reltoastrelid = 0 THEN NULL ELSE pg_size_pretty(pg_relation_size(cl.reltoastrelid) + COALESCE((SELECT SUM(pg_relation_size(indexrelid)) - FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0) + FROM pg_index WHERE indrelid=cl.reltoastrelid)::int8, 0)) END AS {{ conn|qtIdent(_('Toast table size')) }}, COALESCE((SELECT SUM(pg_relation_size(indexrelid)) FROM pg_index WHERE indrelid=stat.relid)::int8, 0)