From 7e7f47a0892a50520d0eee3711b097a2d154f86f Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Sat, 2 Sep 2023 21:57:02 -0500
Subject: [PATCH] Remove deprecated db config keys

---
 .../discal/core/config/Config.kt              | 23 ++++---------------
 .../discal/core/database/DatabaseManager.kt   |  8 +++----
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/config/Config.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/config/Config.kt
index 88a2a19b2..334b64070 100644
--- a/core/src/main/kotlin/org/dreamexposure/discal/core/config/Config.kt
+++ b/core/src/main/kotlin/org/dreamexposure/discal/core/config/Config.kt
@@ -7,6 +7,11 @@ enum class Config(private val key: String, private var value: Any? = null) {
     // Basic spring settings
     APP_NAME("spring.application.name"),
 
+    // Database settings, to be removed once DatabaseManager is retired
+    SQL_URL("spring.r2dbc.url"),
+    SQL_USERNAME("spring.r2dbc.username"),
+    SQL_PASSWORD("spring.r2dbc.password"),
+
     // Redis cache settings
     REDIS_HOST("spring.data.redis.host"),
     REDIS_PORT("spring.data.redis.port"),
@@ -60,24 +65,6 @@ enum class Config(private val key: String, private var value: Any? = null) {
 
     INTEGRATIONS_UPDATE_BOT_LIST_SITES("bot.integrations.update-bot-sites", false),
 
-    // Legacy -- All the below should be deprecated and ultimated removed
-    @Deprecated("Use Spring Data")
-    SQL_HOST("SQL_HOST"),
-
-    @Deprecated("Use Spring Data")
-    SQL_PORT("SQL_PORT"),
-
-    @Deprecated("Use Spring Data")
-    SQL_USER("SQL_USER"),
-
-    @Deprecated("Use Spring Data")
-    SQL_PASS("SQL_PASS"),
-
-    @Deprecated("Use Spring Data")
-    SQL_DB("SQL_DB"),
-
-    @Deprecated("Use Spring Data")
-    SQL_PREFIX("SQL_PREFIX"),
 
     ;
 
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/database/DatabaseManager.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/database/DatabaseManager.kt
index 9fd023116..b32bd440f 100644
--- a/core/src/main/kotlin/org/dreamexposure/discal/core/database/DatabaseManager.kt
+++ b/core/src/main/kotlin/org/dreamexposure/discal/core/database/DatabaseManager.kt
@@ -43,11 +43,9 @@ object DatabaseManager {
             builder()
                 .option(DRIVER, "pool")
                 .option(PROTOCOL, "mysql")
-                .option(HOST, Config.SQL_HOST.getString())
-                .option(PORT, Config.SQL_PORT.getInt())
-                .option(USER, Config.SQL_USER.getString())
-                .option(PASSWORD, Config.SQL_PASS.getString())
-                .option(DATABASE, Config.SQL_DB.getString())
+                .from(parse(Config.SQL_URL.getString()))
+                .option(USER, Config.SQL_USERNAME.getString())
+                .option(PASSWORD, Config.SQL_PASSWORD.getString())
                 .build()
         )