From b18bdd95e583c515967dd9756e78513ed1e03b38 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Wed, 3 Aug 2022 23:32:43 -0400 Subject: [PATCH] Attempt to fix build for MySQL 8.0.30 --- tests/TestCase/Database/Schema/MysqlSchemaTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php index 921fe3ff031..0e556db5bab 100644 --- a/tests/TestCase/Database/Schema/MysqlSchemaTest.php +++ b/tests/TestCase/Database/Schema/MysqlSchemaTest.php @@ -413,9 +413,12 @@ public function testDescribeTable(): void ], ]; - if (ConnectionManager::get('test')->getDriver()->isMariadb()) { + $driver = ConnectionManager::get('test')->getDriver(); + if ($driver->isMariaDb()) { $expected['created_with_precision']['default'] = 'current_timestamp(3)'; $expected['created_with_precision']['comment'] = ''; + } + if ($driver->isMariaDb() || version_compare($driver->version(), '8.0.30', '>=')) { $expected['title']['collate'] = 'utf8mb3_general_ci'; $expected['body']['collate'] = 'utf8mb3_general_ci'; }