From a9f22880e7efc129bfc2932c89dcebdc9f350dea Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 24 Aug 2021 19:53:46 -0500
Subject: [PATCH] Add support for non-persistent db conn

---
 scripts/server/database.js | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/scripts/server/database.js b/scripts/server/database.js
index e32f7c5e..679f8433 100644
--- a/scripts/server/database.js
+++ b/scripts/server/database.js
@@ -22,20 +22,30 @@ function initDatabaseScript() {
 // ===========================================================================
 
 function connectToDatabase() {
-	if(persistentDatabaseConnection == null) {
-		logToConsole(LOG_DEBUG, "[VRR.Database] Initializing database connection ...");
-		persistentDatabaseConnection = module.mysql.connect(databaseConfig.host, databaseConfig.user, databaseConfig.pass, databaseConfig.name, databaseConfig.port);
-		if(persistentDatabaseConnection.error) {
-			console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error));
-			persistentDatabaseConnection = null;
-			return false;
-		}
+	if(databaseConfig.usePersistentConnection) {
+		if(persistentDatabaseConnection == null) {
+			logToConsole(LOG_DEBUG, "[VRR.Database] Initializing database connection ...");
+			persistentDatabaseConnection = module.mysql.connect(databaseConfig.host, databaseConfig.user, databaseConfig.pass, databaseConfig.name, databaseConfig.port);
+			if(persistentDatabaseConnection.error) {
+				console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error));
+				persistentDatabaseConnection = null;
+				return false;
+			}
 
-		logToConsole(LOG_DEBUG, "[VRR.Database] Database connection successful!");
-		return persistentDatabaseConnection;
+			logToConsole(LOG_DEBUG, "[VRR.Database] Database connection successful!");
+			return persistentDatabaseConnection;
+		} else {
+			logToConsole(LOG_DEBUG, "[VRR.Database] Using existing database connection.");
+			return persistentDatabaseConnection;
+		}
 	} else {
-		logToConsole(LOG_DEBUG, "[VRR.Database] Using existing database connection.");
-		return persistentDatabaseConnection;
+		let databaseConnection = module.mysql.connect(databaseConfig.host, databaseConfig.user, databaseConfig.pass, databaseConfig.name, databaseConfig.port);
+		if(databaseConnection.error) {
+			console.warn("[VRR.Database] Database connection error: " + toString(persistentDatabaseConnection.error));
+			return false;
+		} else {
+			return databaseConnection;
+		}
 	}
 }