use an "enum"

.env.example

@@ -8,13 +8,12 @@ ACCOUNT_MANAGER_SECRET=
 # Should be the externally facing IP of your server host
 EXTERNAL_IP=localhost
 
-
-# If using sqlite, set this to 1 and the others to 0. You can ignore the mariadb values if you are using sqlite.
-USING_SQLITE=1
+# The database type that will be used.
+# Acceptable values are `sqlite`, `mysql`, `mariadb`, `maria`.
+# Case insensitive.
+database_type=sqlite
 SQLITE_DATABASE_PATH=resServer/dlu.sqlite
 
-# If using mysql, set this to 1 and the others to 0. You can ignore the sqlite values if you are using mysql.
-USING_MYSQL=0
 # Database values
 # Be careful with special characters here. It is more safe to use normal characters and/or numbers.
 MARIADB_USER=darkflame

CMakeLists.txt

@@ -176,7 +176,7 @@ foreach(resource_file ${RESOURCE_FILES})
 
 				if(NOT ${parsed_current_file_contents} MATCHES ${variable_name})
 					# For backwards compatibility with older setup versions, dont add this option.
-					if(NOT ${variable_name} MATCHES "using_sqlite")
+					if(NOT ${variable_name} MATCHES "database_type")
 						message(STATUS "Adding missing config option " ${variable_name} " to " ${resource_file})
 						set(line_to_add ${line_to_add} ${line})
 

dDatabase/GameDatabase/Database.cpp

@@ -7,15 +7,20 @@
 #include "SQLiteDatabase.h"
 #include "MySQLDatabase.h"
 
+#include <ranges>
+
 #pragma warning (disable:4251) //Disables SQL warnings
 
 namespace {
 	GameDatabase* database = nullptr;
 }
 
 std::string Database::GetMigrationFolder() {
-	if (Game::config->GetValue("using_sqlite") == "1") return "sqlite";
-	else if (Game::config->GetValue("using_mysql") == "1") return "mysql";
+	const std::set<std::string> validMysqlTypes = { "mysql", "mariadb", "maria" };
+	auto databaseType = Game::config->GetValue("database_type");
+	std::ranges::transform(databaseType, databaseType.begin(), ::tolower);
+	if (databaseType == "sqlite") return "sqlite";
+	else if (validMysqlTypes.contains(databaseType)) return "mysql";
 	else {
 		LOG("No database specified, using MySQL");
 		return "mysql";

docker-compose.yml

@@ -34,9 +34,8 @@ services:
       - CLIENT_LOCATION=/app/luclient
       - DLU_CONFIG_DIR=/app/configs
       - DUMP_FOLDER=/app/dump
-      - USING_SQLITE=${USING_SQLITE:-1}
+      - DATABASE_TYPE=${DATABASE_TYPE:sqlite}
       - SQLITE_DATABASE_PATH=${SQLITE_DATABASE_PATH:-resServer/dlu.sqlite}
-      - USING_MYSQL=${USING_MYSQL:-0}
       - SKIP_ACCOUNT_CREATION=${SKIP_ACCOUNT_CREATION:-1}
       - MYSQL_HOST=darkflamedb
       - MYSQL_DATABASE=${MARIADB_DATABASE:-darkflame}

resources/sharedconfig.ini

@@ -69,11 +69,7 @@ chat_server_port=2005
 
 sqlite_database_path=resServer/dlu.sqlite
 
-# If using sqlite, set this to 1 and the others to 0
-using_sqlite=1
-
-# If using mysql, set this to 1 and the others to 0
-using_mysql=0
+database_type=sqlite
 
 # Skips the account creation check in master. Used for non-interactive setups.
 skip_account_creation=0