From 2328cb4e6ea398101b0425cfc9403b0ec82ebb8b Mon Sep 17 00:00:00 2001 From: camer0n Date: Wed, 6 Dec 2023 15:27:26 -0800 Subject: [PATCH] Issue #4501 Modified Charset lookup. --- e107_tests/tests/unit/db_verifyTest.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/e107_tests/tests/unit/db_verifyTest.php b/e107_tests/tests/unit/db_verifyTest.php index df93100ea1..d97d88db32 100644 --- a/e107_tests/tests/unit/db_verifyTest.php +++ b/e107_tests/tests/unit/db_verifyTest.php @@ -1101,22 +1101,24 @@ public function testRunFix() { e107::getPlugin()->install('rss_menu'); } + // Prepare table. $sql->gen('ALTER TABLE `#rss` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;'); - $sql->gen('SHOW CREATE TABLE `#rss`'); - $row = $sql->rows(); - self::assertStringNotContainsString('CHARSET=utf8mb4', $row[1]['Create Table']); + $sql->gen('SHOW TABLE STATUS WHERE Name = "'.MPREFIX.'rss"'); + $row = $sql->fetch('assoc'); + self::assertStringNotContainsString('CHARSET=utf8mb4', $row['Collation']); // Fix table. $this->dbv->compare('rss'); $this->dbv->compileResults(); $this->dbv->runFix(); + // validate table. - $sql->gen('SHOW CREATE TABLE `#rss`'); - $row = $sql->rows(); + $sql->gen('SHOW TABLE STATUS WHERE Name = "'.MPREFIX.'rss"'); + $row = $sql->fetch('assoc'); - self::assertStringContainsString('CHARSET=utf8mb4', $row[1]['Create Table']); + self::assertStringContainsString('utf8mb4_general_ci', $row['Collation']); }