From 17de7db70be9d821b8800d878411a86fc5826088 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 17 May 2017 15:53:13 +0100 Subject: [PATCH] Fix server stats display for EPAS 9.2, where inet needs casting to text for concatenation. Fixes #1831 --- .../servers/templates/servers/sql/9.2_plus/stats.sql | 4 ++-- .../servers/templates/servers/sql/9.6_plus/stats.sql | 4 ++-- .../servers/templates/servers/sql/default/stats.sql | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.2_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.2_plus/stats.sql index 0b397f670..189db28bb 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.2_plus/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.2_plus/stats.sql @@ -7,7 +7,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE @@ -32,7 +32,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.6_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.6_plus/stats.sql index a1dbc37e7..99bf2f49d 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.6_plus/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/9.6_plus/stats.sql @@ -7,7 +7,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE @@ -33,7 +33,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/stats.sql index 54447ba72..62552190d 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/stats.sql @@ -7,7 +7,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE @@ -32,7 +32,7 @@ SELECT WHEN client_hostname IS NOT NULL AND client_hostname != '' THEN client_hostname || ':' || client_port WHEN client_addr IS NOT NULL AND client_addr::text != '' THEN - client_addr || ':' || client_port + client_addr::text || ':' || client_port WHEN client_port = -1 THEN 'local pipe' ELSE