Unbreak mysql tests and fix one more issue with CURRENT_TIMESTAMP vs …

…current_timestamp()
cakephp · Dec 11, 2024 · 57133d7 · 57133d7
1 parent 0c70293
commit 57133d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/tests/TestCase/Db/Adapter/MysqlAdapterTest.php b/tests/TestCase/Db/Adapter/MysqlAdapterTest.php
@@ -531,11 +531,11 @@ public function testAddTimestampsFeatureFlag()
         $this->assertEquals('datetime', $columns[1]->getType());
         $this->assertEquals('', $columns[1]->getUpdate());
         $this->assertFalse($columns[1]->isNull());
-        $this->assertEquals('CURRENT_TIMESTAMP', $columns[1]->getDefault());
+        $this->assertContains($columns[1]->getDefault(), ['CURRENT_TIMESTAMP', 'current_timestamp()']);
 
         $this->assertEquals('updated', $columns[2]->getName());
         $this->assertEquals('datetime', $columns[2]->getType());
-        $this->assertEquals('CURRENT_TIMESTAMP', $columns[2]->getUpdate());
+        $this->assertContains($columns[2]->getUpdate(), ['CURRENT_TIMESTAMP', 'current_timestamp()']);
         $this->assertTrue($columns[2]->isNull());
         $this->assertNull($columns[2]->getDefault());
     }

diff --git a/tests/comparisons/Diff/addRemove/the_diff_add_remove_mysql.php b/tests/comparisons/Diff/addRemove/the_diff_add_remove_mysql.php
@@ -5,13 +5,6 @@
 
 class TheDiffAddRemoveMysql extends BaseMigration
 {
-    private function isMariaDB(): bool
-    {
-        $version = $this->adapter->getConnection()->getDriver()->version();
-
-        return version_compare($version, '10.0', '>=');
-    }
-
     /**
      * Up Method.
      *
@@ -36,7 +29,7 @@ public function up(): void
         $this->table('articles')
             ->addColumn('the_text', 'text', [
                 'after' => 'title',
-                'collation' => $this->isMariaDB() ? 'utf8mb4_unicode_520_ci' : 'utf8mb4_0900_ai_ci',
+                'collation' => 'utf8mb4_0900_ai_ci',
                 'default' => null,
                 'length' => null,
                 'null' => false,