From f4ee5271afeb44cac945d0f07e9bc0413956ee19 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:24:00 +0800
Subject: [PATCH] Improve error handling of mysqlQuery and return row count as
 result

---
 server/util-server.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/util-server.js b/server/util-server.js
index 1cdf33de5..47f6bb48c 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -335,15 +335,13 @@ exports.mysqlQuery = function (connectionString, query) {
         connection.query(query, (err, res) => {
             if (err) {
                 reject(err);
-            }
-
-            // Check if res is an array
-            if (Array.isArray(res)) {
-                resolve("Rows: " + res.length);
             } else {
-                resolve("No Error, but the result is not an array. Type: " + typeof res);
+                if (Array.isArray(res)) {
+                    resolve("Rows: " + res.length);
+                } else {
+                    resolve("No Error, but the result is not an array. Type: " + typeof res);
+                }
             }
-
             connection.destroy();
         });
     });