From 0341321641bdc9e07e7702dbbf1ef614a7e04a1a Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <edoughtypapassideris@linagora.com>
Date: Fri, 13 Dec 2024 19:54:36 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20back:=20flatten=20postgres=20dia?=
 =?UTF-8?q?gnostics=20(a=20bit)=20(#762)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/orm/connectors/postgres/postgres.ts    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres.ts b/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres.ts
index 209bc206..663f06fd 100644
--- a/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres.ts
+++ b/tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres.ts
@@ -72,9 +72,10 @@ export class PostgresConnector extends AbstractConnector<PostgresConnectionOptio
 
   async getDiagnostics(depth: TServiceDiagnosticDepth): Promise<TDiagnosticResult> {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const safeRequest = async (query: string, values?: any[]) => {
+    const safeRequest = async (query: string, values?: any[], singleRow = false) => {
       try {
-        return (await this.client.query(query, values)).rows;
+        const rows = (await this.client.query(query, values)).rows;
+        return singleRow && rows?.length === 1 ? rows[0] : rows;
       } catch (err) {
         const logId = "pg-diags-error-" + Math.floor(process.uptime() * 1000);
         logger.error(
@@ -94,9 +95,11 @@ export class PostgresConnector extends AbstractConnector<PostgresConnectionOptio
       case TServiceDiagnosticDepth.stats_track:
         return {
           ok: true,
-          db: await safeRequest("select * from pg_stat_database where datname = $1", [
-            this.options.database,
-          ]),
+          db: await safeRequest(
+            "select * from pg_stat_database where datname = $1",
+            [this.options.database],
+            true,
+          ),
         };
       case TServiceDiagnosticDepth.stats_basic:
         return { ok: true, empty: true };