fix modified column being nullable

Author: LordSimal

composer.json

@@ -29,7 +29,7 @@
     },
     "require-dev": {
         "cakephp/bake": "^3.3",
-        "cakephp/cakephp": "^5.3.0",
+        "cakephp/cakephp": "^5.3.2",
         "cakephp/cakephp-codesniffer": "^5.0",
         "phpunit/phpunit": "^11.5.3 || ^12.1.3"
     },

src/Db/Table.php

@@ -729,8 +729,8 @@ public function addTimestamps(string|false|null $createdAt = 'created', string|f
         }
         if ($updatedAt) {
             $this->addColumn($updatedAt, $timestampType, [
-                'null' => true,
-                'default' => null,
+                'null' => false,
+                'default' => 'CURRENT_TIMESTAMP',
                 'update' => 'CURRENT_TIMESTAMP',
                 'timezone' => $withTimezone,
             ]);

tests/TestCase/Db/Adapter/MysqlAdapterTest.php

@@ -576,8 +576,8 @@ public function testAddTimestampsFeatureFlag()
         $this->assertEquals('updated', $columns[2]->getName());
         $this->assertEquals('datetime', $columns[2]->getType());
         $this->assertContains($columns[2]->getUpdate(), ['CURRENT_TIMESTAMP', 'current_timestamp()']);
-        $this->assertTrue($columns[2]->isNull());
-        $this->assertNull($columns[2]->getDefault());
+        $this->assertFalse($columns[2]->isNull());
+        $this->assertContains($columns[2]->getDefault(), ['CURRENT_TIMESTAMP', 'current_timestamp()']);
     }
 
     public function testCreateTableWithSchema()

tests/TestCase/Db/Adapter/SqliteAdapterTest.php

@@ -2092,7 +2092,7 @@ public function testAlterTableColumnAdd()
             ['name' => 'string_col_2', 'type' => 'string', 'default' => null, 'null' => true],
             ['name' => 'string_col_3', 'type' => 'string', 'default' => null, 'null' => false],
             ['name' => 'created', 'type' => 'timestamp', 'default' => 'CURRENT_TIMESTAMP', 'null' => false],
-            ['name' => 'updated', 'type' => 'timestamp', 'default' => null, 'null' => true],
+            ['name' => 'updated', 'type' => 'timestamp', 'default' => 'CURRENT_TIMESTAMP', 'null' => false],
         ];
 
         $this->assertEquals(count($expected), count($columns));

tests/TestCase/Db/Table/TableTest.php

@@ -195,8 +195,8 @@ public function testAddTimestamps(
         $this->assertEquals('timestamp', $columns[1]->getType());
         $this->assertEquals($withTimezone, $columns[1]->getTimezone());
         $this->assertEquals('CURRENT_TIMESTAMP', $columns[1]->getUpdate());
-        $this->assertTrue($columns[1]->isNull());
-        $this->assertNull($columns[1]->getDefault());
+        $this->assertFalse($columns[1]->isNull());
+        $this->assertEquals('CURRENT_TIMESTAMP', $columns[1]->getDefault());
     }
 
     /**
@@ -246,8 +246,8 @@ public function testAddTimestampsNoCreated(AdapterInterface $adapter)
         $this->assertSame('timestamp', $columns[0]->getType());
         $this->assertFalse($columns[0]->getTimezone());
         $this->assertSame('CURRENT_TIMESTAMP', $columns[0]->getUpdate());
-        $this->assertTrue($columns[0]->isNull());
-        $this->assertNull($columns[0]->getDefault());
+        $this->assertFalse($columns[0]->isNull());
+        $this->assertSame('CURRENT_TIMESTAMP', $columns[0]->getDefault());
     }
 
     /**
@@ -299,8 +299,8 @@ public function testAddTimestampsWithTimezone(
         $this->assertEquals('timestamp', $columns[1]->getType());
         $this->assertTrue($columns[1]->getTimezone());
         $this->assertEquals('CURRENT_TIMESTAMP', $columns[1]->getUpdate());
-        $this->assertTrue($columns[1]->isNull());
-        $this->assertNull($columns[1]->getDefault());
+        $this->assertFalse($columns[1]->isNull());
+        $this->assertEquals('CURRENT_TIMESTAMP', $columns[1]->getDefault());
     }
 
     public function testInsert()

tests/TestCase/MigrationsTest.php

@@ -220,9 +220,7 @@ public function testMigrateAndRollback()
         $createdColumn = $storesTable->getSchema()->getColumn('created');
         $expected = 'CURRENT_TIMESTAMP';
         $driver = $this->Connection->getDriver();
-        if ($driver instanceof Mysql && $driver->isMariadb()) {
-            $expected = 'current_timestamp()';
-        } elseif ($driver instanceof Sqlserver) {
+        if ($driver instanceof Sqlserver) {
             $expected = 'getdate()';
         }
         $this->assertEquals($expected, $createdColumn['default']);