From 511b41eb6816323f76b0849a17a56d4ac279efaa Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:09:23 +0300 Subject: [PATCH] Fix CorrectWrongCharacterEncodingPatch applying to non Plan tables in same database --- .../patches/CorrectWrongCharacterEncodingPatch.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/CorrectWrongCharacterEncodingPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/CorrectWrongCharacterEncodingPatch.java index f8d1ec15d..e739555b2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/CorrectWrongCharacterEncodingPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/CorrectWrongCharacterEncodingPatch.java @@ -63,6 +63,7 @@ public class CorrectWrongCharacterEncodingPatch extends Patch { String selectTablesWithWrongCharset = "SELECT CONCAT('ALTER TABLE `', table_name, '` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;')\n" + "FROM information_schema.TABLES AS T, information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` AS C\n" + "WHERE C.collation_name = T.table_collation\n" + + "AND T.table_name LIKE 'plan\\_%'\n" + "AND T.table_schema = '" + databaseName + "'\n" + "AND\n" + "(\n" + @@ -74,6 +75,7 @@ public class CorrectWrongCharacterEncodingPatch extends Patch { String selectColumnsWithWrongCharset = "SELECT CONCAT('ALTER TABLE `', table_name, '` MODIFY `', column_name, '` ', DATA_TYPE, '(', CHARACTER_MAXIMUM_LENGTH, ') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci', (CASE WHEN IS_NULLABLE = 'NO' THEN ' NOT NULL' ELSE '' END), ';')\n" + "FROM information_schema.COLUMNS \n" + "WHERE TABLE_SCHEMA = '" + databaseName + "'\n" + + "AND table_name LIKE 'plan\\_%'\n" + "AND DATA_TYPE = 'varchar'\n" + "AND\n" + "(\n" +