Update.

cakephp · Dec 11, 2014 · 8c008ad · 8c008ad
1 parent 5cff6aa
commit 8c008ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -353,7 +353,6 @@ public function describe($model) {
 			}
 			if ($fields[$column->Field]['type'] === 'timestamp' && strtoupper($column->Default) === 'CURRENT_TIMESTAMP') {
 				$fields[$column->Field]['default'] = null;
-				$fields[$column->Field]['null'] = true;
 			}
 			if (!empty($column->Key) && isset($this->index[$column->Key])) {
 				$fields[$column->Field]['key'] = $this->index[$column->Key];

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -909,14 +909,13 @@ public function testDescribeHandleCurrentTimestamp() {
 		$this->Dbo->execute('DROP TABLE ' . $name);
 
 		$this->assertNull($result['limit_date']['default']);
-		$this->assertTrue($result['limit_date']['null']);
 
 		$schema = new CakeSchema(array(
 			'connection' => 'test',
 			'testdescribes' => $result
 		));
 		$result = $this->Dbo->createSchema($schema);
-		$this->assertContains('`limit_date` timestamp NULL,', $result);
+		$this->assertContains('`limit_date` timestamp NOT NULL,', $result);
 	}
 
 /**