Merge pull request #16670 from cakephp/fix-build

Attempt to fix build for MySQL 8.0.30
cakephp · Aug 5, 2022 · 4210057 · 4210057
2 parents 923f04a + b18bdd9
commit 4210057
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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';
         }