From b036c2c536491217abafe87f7ea917691acd89b3 Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Fri, 15 Oct 2021 22:55:49 -0500 Subject: [PATCH] Rename db tables to drop unneeded prefix (legacy) --- .../discal/core/database/DatabaseManager.kt | 23 +++++++++++++------ .../db/migration/V21__Rename_Tables.sql | 10 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 core/src/main/resources/db/migration/V21__Rename_Tables.sql 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 81100ef9..55b013ed 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 @@ -1336,17 +1336,26 @@ private object Queries { } private object Tables { - val API = "${BotSettings.SQL_PREFIX.get()}api" + /* The language annotations are there because IntelliJ is dumb and assumes this needs to be proper MySQL */ - val GUILD_SETTINGS = "${BotSettings.SQL_PREFIX.get()}guild_settings" + @Language("Kotlin") + const val API: String = "api" - val CALENDARS = "${BotSettings.SQL_PREFIX.get()}calendars" + @Language("Kotlin") + const val GUILD_SETTINGS = "guild_settings" - val ANNOUNCEMENTS = "${BotSettings.SQL_PREFIX.get()}announcements" + @Language("Kotlin") + const val CALENDARS = "calendars" - val EVENTS = "${BotSettings.SQL_PREFIX.get()}events" + @Language("Kotlin") + const val ANNOUNCEMENTS = "announcements" - val RSVP = "${BotSettings.SQL_PREFIX.get()}rsvp" + @Language("Kotlin") + const val EVENTS = "events" - val CREDS = "${BotSettings.SQL_PREFIX.get()}credentials" + @Language("Kotlin") + const val RSVP = "rsvp" + + @Language("Kotlin") + const val CREDS = "credentials" } diff --git a/core/src/main/resources/db/migration/V21__Rename_Tables.sql b/core/src/main/resources/db/migration/V21__Rename_Tables.sql new file mode 100644 index 00000000..40f65d40 --- /dev/null +++ b/core/src/main/resources/db/migration/V21__Rename_Tables.sql @@ -0,0 +1,10 @@ +# noinspection SqlResolveForFile + +RENAME TABLE '${prefix}announcements' TO 'announcements', + '${prefix}api' TO 'api', + '${prefix}calendars' TO 'calendars', + '${prefix}credentials' TO 'credentials', + '${prefix}events' TO 'events', + '${prefix}guild_settings' TO 'guild_settings', + '${prefix}rsvp' TO 'rsvp'; +