Improve handling of CURRENT_TIMESTAMP default value

bancer · web-flow · commit 1a62c147fee8 · 2018-09-12T16:45:01.000+02:00
Resolves #12553.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -3539,7 +3539,7 @@ public function buildColumn($column) {
 		} elseif (isset($column['null']) && $column['null'] === false) {
 			$out .= ' NOT NULL';
 		}
-		if ($type === 'timestamp' && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
+		if (in_array($type, array('timestamp', 'datetime')) && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
 			$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);
 		}
 		return $this->_buildFieldParameters($out, $column, 'afterDefault');

Original file line number	Diff line number	Diff line change
`@@ -3539,7 +3539,7 @@ public function buildColumn($column) {`
`3539`	`3539`	`} elseif (isset($column['null']) && $column['null'] === false) {`
`3540`	`3540`	`$out .= ' NOT NULL';`
`3541`	`3541`	`}`
`3542`		`- if ($type === 'timestamp' && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {`
	`3542`	`+ if (in_array($type, array('timestamp', 'datetime')) && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {`
`3543`	`3543`	`$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);`
`3544`	`3544`	`}`
`3545`	`3545`	`return $this->_buildFieldParameters($out, $column, 'afterDefault');`