Fix null default values not being returned by defaultValues()

Refs #5454
cakephp · Dec 20, 2014 · 28cae9d · 28cae9d
1 parent b9af093
commit 28cae9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Database/Schema/Table.php b/src/Database/Schema/Table.php
@@ -342,7 +342,7 @@ public function columnType($name, $type = null) {
 	public function defaultValues() {
 		$defaults = [];
 		foreach ($this->_columns as $name => $data) {
-			if (isset($data['default'])) {
+			if (array_key_exists('default', $data)) {
 				$defaults[$name] = $data['default'];
 			}
 		}

diff --git a/tests/TestCase/Database/Schema/TableTest.php b/tests/TestCase/Database/Schema/TableTest.php
@@ -164,11 +164,13 @@ public function testDefaultValues() {
 			'default' => 'A title'
 		])->addColumn('body', [
 			'type' => 'text',
+			'default' => null,
 		]);
 		$result = $table->defaultValues();
 		$expected = [
 			'id' => 0,
-			'title' => 'A title'
+			'title' => 'A title',
+			'body' => null
 		];
 		$this->assertEquals($expected, $result);
 	}